Hello, could you please look at
http://mtn-host.prjek.net/viewmtn/ufs-trans/revision/info/951b0672754af7e3272775d548c04e3659089bd6 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. (comparing with the common ancestor 0795cc5f13f244bba69fd77457427d06026413e0, the file changed only on one side, 6eb5489725a8c1b10bab48b8341fc5b3e57287a4) two other people checked the merge independently and we always arrived at the same revision hash, so I think we can rule out some local corruption. any ideas? Pavel Cahyna _______________________________________________ Monotone-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/monotone-devel
