probably bug? merge A B and merge B A produce different set of conflicts

Alexander Belchenko bialix at ukr.net
Thu Nov 29 14:09:51 GMT 2007


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.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: case.insensitive.wt.bundle
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20071129/c4a82b4b/attachment-0001.diff 


More information about the bazaar mailing list