[Top][All Lists]

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

Re: [Gnash-dev] Bazaar blues

From: Benjamin Wolsey
Subject: Re: [Gnash-dev] Bazaar blues
Date: Tue, 09 Dec 2008 07:52:58 +0100

Am Montag, den 08.12.2008, 23:37 -0500 schrieb Tonko Juricic:
> 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.

There are guides to using bzr that are worth reading carefully, as it
works well (though very slowly) once you get the hang of it.

A commit will commit to your local repository. After a commit, bzr diff
won't output anything. To see conflicts: bzr conflicts. After you've
fixed a conflict: bzr resolve. To see diff from trunk: bzr diff --old

You can also do bzr merge --preview to see what will happen before you
actually merge.


Use Gnash, the GNU Flash Player!

Benjamin Wolsey, Software Developer -

Attachment: signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil

reply via email to

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