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?
try: bzr send -o mychanges.diff This will generate a diff that also contains bzr history. Bastiaan _______________________________________________ Gnash-dev mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnash-dev
