Re: [Monotone-devel] conflict messages

[Thomas Keller]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Derek Scherger schrieb:
> I'm mostly finished with the cleanup of non-content conflict messages
> I've been working on lately. Here are some samples from the output of
> tests/conflict_messages on the
> net.venge.monotone.cleanup.conflict-messages branch. These mostly follow
> the suggestions Zack had to my earlier email.

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?

> 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?

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?

Thomas.

- --
only dead fish swim with the stream: http://thomaskeller.biz/blog
Für Freiheit und gegen staatliche Überwachungsmaßnahmen:
http://leipzig.vorratsdatenspeicherung.de
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHXUKCaf7NlBYNEJIRAkI4AJ9qf2zWa1+B6OkkdkmYwIwc/z+qSQCgh5E8
+fO/TiZQz3c8nHwWjVRyU0E=
=6wrH
-----END PGP SIGNATURE-----