Darren J Moffat wrote:
Richard Lowe wrote:
(no guarantees there isn't a better way)
# All the revisions you have and they don't, except the merges
hg outgoing -M --template '{node}' > to-preserve
# Export all those in such a way they glob in the right order
for node in $(<to-preserve); hg export -o "%b-%r-%h.diff"
# List of the merges you've done
hg log -m # Assuming all your merges are yours, and relative to the
right
# parent
# I arranged the exported diffs into directories representing the spaces
# between merges here, so the merges could be preserved in the right
places
# there's probably a great way to automate this, but I didn't.
# Clone to the revision prior to your first local revision.
hg clone -r $BASE onnv-clone onnv-yourtree-rebuild
hg import base_to_first_merge/*
hg pull -r $FIRST_MERGE onnv-clone
hg merge
hg import first_to_second_merge/*
hg pull -r $SECOND_MERGE onnv-clone
hg merge
Oh boy, thats a lot of work.
Lets hope we never have this kind of failure in the bridge again. The
sooner mercurial becomes the master the better!
As I said in #onnv, the sooner this bridge can be burned, the better. :)
--
stephen lau // [EMAIL PROTECTED] | 650.786.0845 | http://whacked.net
opensolaris // solaris kernel development
_______________________________________________
opensolaris-code mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/opensolaris-code
