probably bug? merge A B and merge B A produce different set of conflicts
Aaron Bentley
aaron.bentley at utoronto.ca
Thu Nov 29 14:51:05 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Alexander Belchenko wrote:
> Aaron Bentley пишет:
>> Alexander Belchenko wrote:
>>> Sometimes bzr merge produce conflicts. Nothing wrong usually.
>>> Conflicts often unpleasant thing, but most of the time they
>>> at least understandable.
>>
>> Could you please post your case.insensitive.wt or a merge directive with
>> its revisions?
>>
>>> But this situation is out of my understanding.
>>
>> My best guess would be poor choice of a least common ancestor, but I
>> really need the branches in question to know.
>
> C:\work\Bazaar\devel\case.insensitive.wt>bzr bundle --no-patch >
> case.insensitive.wt.bundle
>
> Attached. If this bundle lacks some info then I'll publish it on my server.
Thanks. I think that's enough.
You say you get different conflicts, but I can't reproduce this-- I get
conflicts in the same files, either way:
~/bzr/case.insensitive.wt$ bzr merge ../bzr.dev
...
Text conflict in NEWS
Text conflict in bzrlib/plugins/launchpad/test_register.py
Text conflict in bzrlib/repository.py
Text conflict in bzrlib/tests/test_errors.py
Text conflict in bzrlib/tests/test_smart.py
$ cd ../bzr.dev
:~/bzr/bzr.dev$ bzr merge ../case.insensitive.wt/
...
Text conflict in NEWS
Text conflict in bzrlib/plugins/launchpad/test_register.py
Text conflict in bzrlib/repository.py
Text conflict in bzrlib/tests/test_errors.py
Text conflict in bzrlib/tests/test_smart.py
This is with bzr.dev revno 3042 and case.insensitive.wt revno 2992
I agree it doesn't seem to make sense that you would get conflicts in
files you haven't changed.
What happened is you did a criss-cross merge at revno 2991. You merged
your mv.change.case branch into your case.insensitive.wt branch. This
meant that there was no least common ancestor (LCA), so we had to look
much farther back in history to find a common ancestor.
If you use annotate merge, (bzr merge --weave) you should only get
conflicts in NEWS.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHTtHZ0F+nu1YWqI0RApuMAJ0ZvOduasXcsvVpR0ObmN+B4Y39MgCfaWKW
Io7tzhW7AWTa1lZuSAYjP0I=
=3y01
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list