Dummy merge of default branch into lwtools hg -y merge --tool=internal:fail default hg revert --all --no-backup --rev . hg resolve -a -m This dummy merge discards any changes from the default branch so that the result is the same as what lwtools already had. When merging back to default branch later, the discarded changes will be discarded there also, so the result will be that the default branch will contain what the lwtools branch had before these merges. Only scripts/burst was "rescued" from default branch.

d1 s1 v0 v1 v9 v12
d1 s1 v0 v2 v10
d2 s1 v0 v3
d2 s1 v0 v4 v11 v12
d3 s1 v0 v5 v9 v10 v11