Bizare Bazaar

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 7/12/2011 10:12 AM, Matt Scarisbrick wrote:
> 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
> 

Often people will have a local branch of "master" that they merge from.
They may not have updated it after you updated the real master before
they merge it.

There are other ways to get criss-cross, such as by having 2 integration
branches. If they both merge feature branches, then after 2 feature
branches are merged, there is no longer a simple base to pick from for
future merges.

A screenshot could be helpful.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk4cB9MACgkQJdeBCYSNAAPe1ACePCiHl+RnG+/AABT221kJTT9Q
SK0An2IYn2sjxMTUAYlK0r82Vg57gRhh
=0AdN
-----END PGP SIGNATURE-----