Mercurial > hg
view tests/test-rename-dir-merge2 @ 9403:3738c8cff1bf
test-keyword: update output to match 5d49fdef6fd0
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Thu, 27 Aug 2009 00:00:15 +0200 |
parents | c95060a5391a |
children |
line wrap: on
line source
#!/bin/sh mkdir r1 cd r1 hg init mkdir a echo foo > a/f hg add a hg ci -m "a/f == foo" cd .. hg clone r1 r2 cd r2 hg mv a b echo foo1 > b/f hg ci -m" a -> b, b/f == foo1" cd .. cd r1 mkdir a/aa echo bar > a/aa/g hg add a/aa hg ci -m "a/aa/g" hg pull ../r2 hg merge hg st -C