[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] conflict messages
From: |
Derek Scherger |
Subject: |
Re: [Monotone-devel] conflict messages |
Date: |
Mon, 10 Dec 2007 21:02:54 -0700 |
User-agent: |
Thunderbird 2.0.0.9 (X11/20071116) |
Thomas Keller wrote:
> Very cool! Just for my understanding...
>
>> mtn: [left] 312c6ef90e9ed514f28b72b5926fe466c6a9468a
>> mtn: [right] 0442b661dbd5dd18f5ed43b07138bade830bb169
>> mtn: conflict: duplicate name 'bar'
>> mtn: added as a new file on the left
>> mtn: added as a new file on the right
>
> Is this the old "multiple nodes want the same parent" message?
Indeed it is. Hopefully this is describing the situation a bit more clearly.
>> mtn: [left] bc12c73c56eb29876c49e588344920b08e723a44
>> mtn: [right] fcf6894e6bf1b25299f10470be33fc80c555be6c
>> mtn: conflict: content conflict on file 'foo'
>> mtn: content hash is f1bb6fff2ad16d67143d89fc374ede7abec5d437 on the left
>> mtn: content hash is b966b2d35b99e456cb0c55e4573ef0b1b155b4a9 on the right
>
> This is the notice after what the merge dialog usually pops up, right?
Yes. Except that you should now see a message like this for every
content conflict that needs resolving *before* the merge dialog pops up.
> Its very cool to even see attribute conflicts get properly handled now,
> thanks a lot for this work! Any plans to merge that in before Richard
> tags 0.38?
I think I'd rather wait until after 0.38 actually. It would be good for
at least a couple of people to look over the changes in the revisions I
mentioned.
I really don't expect that this change is going to cause any major
problems but a few "fetching non-existent entry from children" type of
errors would not really surprise me. There are a lot of node ids being
looked up in several different rosters and while I tried hard to be
thorough it's very possible that I've missed something.
Cheers,
Derek