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 <path-to-trunk-repository>. You can also do bzr merge --preview to see what will happen before you actually merge. bwy -- Use Gnash, the GNU Flash Player! http://www.gnu.org/software/gnash/ Benjamin Wolsey, Software Developer - http://benjaminwolsey.de
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil
_______________________________________________ Gnash-dev mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnash-dev
