In response to a problem that John Levon was seeing, I've changed wx2hg
to check the ancestor file before doing a 3-way merge. If the ancestor
doesn't match the file in the (Teamware) parent workspace, wx2hg errors
out with a message like
3-way merge: usr/src/tools/scripts/Makefile.new
wx2hg: ancestor does not match parent; is "-r onnv_47" correct?
I'd like to push this to the project gate (after squishing the deltas)
on Friday (7 September).
Webrev is at http://cr.opensolaris.org/~kupfer/wx2hg/, and an updated
man page is at http://cr.opensolaris.org/~kupfer/wx2hg.1.pdf.
I'm assuming that the new error message is self-explanatory. If you
disagree, let me know, and I'll add it to the man page (with some
explanatory text).
mike
