Robert Widhopf-Fenk <[EMAIL PROTECTED]> writes: > On Tuesday, February 12, 2008 at 00:09:40, Matthieu Moy wrote: >> Stefan Reichör <[EMAIL PROTECTED]> writes: >> >> > When I merge from your branch, I get a conflict. >> > Bzr tells me that a criss-cross merge occured. The suggestion to use the >> > --weave >> > parameter for merge does not help. >> >> OK: actually, in december (revision 295 in your branch), you >> uncommited a change that I had already pulled. > > Maybe the BZR folks should disallow a uncommit after a push :-)
There was a revision in my branch that was really wrong. I think I know now what I did wrong: I merged from a branch and reverted it via: bzr revert . I should have used: bzr revert What I did was: I merged a bunch of changes and undid them all, but I kept the information that I merged the changes. Then I looked at all partner branches and decided to uncommit after push. Since I know this trap now, there is no need for an uncommit because of that reason in the future ;-) Stefan. _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
