Re: [Gnash-commit] /srv/bzr/gnash/trunk r9587: Bugfix to PNG image input.

[strk]

On Tue, Aug 12, 2008 at 10:30:43PM +0200, Benjamin Wolsey wrote:

>       Merge in from trunk. Why do I have to do this?

What I usually do is:
        1) commit to branch,
        2) switch to trunk, update trunk,
        3) merge branch to trunk, commit trunk,
        4) switch to branch, pull trunk to branch.

The above doesn't prompt me to commit anything back.
Maybe youre 'merging' trunk into branch ?
Note that my branch has my local trunk as "parent" branch
and my local trunk has shared trunk as "parent" branch.


--strk;