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

[strk]

On Wed, Aug 13, 2008 at 10:44:59AM +0200, Benjamin Wolsey wrote:
> > 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.
> > 
> 
> Mostly that's what I do too, but sometimes it's useful to keep the
> working branch in sync with trunk.

You may try shelve to clean your branch w/out loosing patches
(I'd make a patch to be sure), then pull, then unshelve (or patch)

--strk;

 ()   ASCII Ribbon Campaign
 /\   Keep it simple!