author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Sat, 29 Mar 2008 21:15:34 +0100 | |
changeset 6403 | f615ece5fec3 |
parent 5567 | 56e9f7b2d8fa |
child 8167 | 6c82beaaa11a |
permissions | -rwxr-xr-x |
#!/bin/sh mkdir t cd t hg init mkdir a echo foo > a/a echo bar > a/b hg ci -Am "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 echo quux > a/d 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