Bazaar

  1. Bug #557098
  2. Comment #1

Comment 1 for bug 557098

Revision history for this message
Andrew Bennetts (spiv) wrote : Re: Merging the trunk into a branch causes spurious conflicts (CVS merges better than bzr)

It's not clear to me that these are spurious. "bzr missing" says that 3.4 has 227 revisions not in 3.6, and 3.6 has 548 not in 3.4. With that amount of divergence I'm not surprised to see some conflicts. FWIW, with --lca I only get 58 conflicts.

Looking at the conflicts, some conflicts are due to one branch adding files to extensions/example/code/, while the other branch wants to delete that directory. That seems like a legitimate conflict to me. My CVS expertise is very rusty, but are you sure that "cvs up -dP -rXXX" really does a comparable merge? I would have thought that it would be more like "bzr pull --overwrite".

I tested with 3.4 r6758 and 3.6 r7079.