Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-dir-merge @ 4519:5a9e767c2908
Include convert extension in packages setup
(reported by Christian Ebert and Eric Hopper)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 07 Jun 2007 22:28:52 +0200 |
parents | 7b88bd88f040 |
children | dee573ba79f1 |
line wrap: on
line source
#!/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 co -C 1 hg merge --debug 2 echo a/* b/* hg st -C hg ci -m "4 merge 1+2" -d "0 0"