Re: [Monotone-devel] merge bug? - silent data change

[Markus Schiltknecht]

Hello Pavel,

Pavel Cahyna wrote:
> it can be obtained by mtn pull ufs-trans.mtn-host.prjek.net.
> look at the diff of sys/dev/wscons/wsdisplay_vcons.c
> (http://mtn-host.prjek.net/viewmtn/ufs-trans/revision/diff/6eb5489725a8c1b10bab48b8341fc5b3e57287a4/with/951b0672754af7e3272775d548c04e3659089bd6/sys/dev/wscons/wsdisplay_vcons.c)
>
> it is obviously nonsensical. I think that there is no reason to produce
> such a difference so it is apparently a merge bug.

The diff looks somewhat like the problem I had until recently. It's been 
covered by test_a_merge_8 and I've (hopefully) fixed it just recently.

Do you have a change of trying the merge with a bleeding-edge (i.e. 
newest checkout) monotone version?

Unfortunately, I'm currently on vacation, otherwise I'd give it a try.

Please let us know if the newish monotone produces a more sane merge.

Regards

Markus