[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnash-dev] Bazaar blues

From: Bastiaan Jacques
Subject: Re: [Gnash-dev] Bazaar blues
Date: Tue, 9 Dec 2008 01:30:02 -0800 (PST)
User-agent: Alpine 2.00 (DEB 1167 2008-08-23)

On Mon, 8 Dec 2008, Tonko Juricic wrote:

I don't understand bazaar. I'm afraid I'm merging and committing
without a slightest idea of what will be the result of the operation.
After resolving the conflicts I wanted to create a new diff. However I
first performed a commit because the output from diff was huge (and
those were hardly just my changes from conflict resolution) and merge
wouldn't merge since I have not committed anything. Now when I type
bzr diff it outputs nothing. So how do I report my latest diff from
the trunk?


bzr send -o mychanges.diff

This will generate a diff that also contains bzr history.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]