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

Alexander Belchenko bialix at ukr.net
Fri Nov 30 12:29:18 GMT 2007


Alexander Belchenko пишет:
> Aaron Bentley пишет:
>>>> 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:
> 
>> This is with bzr.dev revno 3042 and case.insensitive.wt revno 2992
> 
> Hmm, I can't reproduce it too with current bzr.dev. And I'm not sure 
> about past report, I think I saw what I saw, but it was last night and 
> my eyes could be a bit tired.

s/last night/late night/



More information about the bazaar mailing list