author | Bryan O'Sullivan <bos@serpentine.com> |
Fri, 05 Oct 2007 12:28:18 -0700 | |
changeset 5386 | 8051549afb32 |
parent 5229 | dee573ba79f1 |
child 5567 | 56e9f7b2d8fa |
permissions | -rwxr-xr-x |
#!/bin/sh mkdir t cd t hg init mkdir a echo foo > a/a echo bar > a/b hg add a hg ci -m "0" -d "0 0" hg co -C 0 hg mv a b hg ci -m "1 mv a/ b/" -d "0 0" hg co -C 0 echo baz > a/c hg add a/c hg ci -m "2 add a/c" -d "0 0" hg merge --debug 1 echo a/* b/* hg st -C hg ci -m "3 merge 2+1" -d "0 0" hg debugrename b/c hg co -C 1 hg merge --debug 2 echo a/* b/* hg st -C hg ci -m "4 merge 1+2" -d "0 0" hg debugrename b/c