Bizare Bazaar
Matt Scarisbrick
matt_scarisbrick at cantab.net
Tue Jul 12 08:12:29 UTC 2011
Dear All,
I've been using Bazaar for 3 years now, but recently I've been seeing
some odd behviour and wondered if anyone knows why. We operate with a
master branch which I control and devs all have their own branch of that
master. I merge their changes in and they merge back to get the up to
date mainline. However, sometimes when I merge their changes I get a
criss-cross merge, and looking in the log it shows that when they merged
with the master branch it actually merged a couple of revisions behind
the head of that branch at the time, which I suspect is what is causing
the criss-cross. Has anyone seen this behviour before and how I can
correct it? (We're all using v 2.x) - I can provide a screenshot if
that's useful.
Many thanks,
Matt
More information about the bazaar
mailing list