Mercurial > hg
view tests/test-rename-dir-merge2 @ 8380:a00a4db76a15
context: replace pseudo-set by real set
author | Simon Heimberg <simohe@besonet.ch> |
---|---|
date | Thu, 14 May 2009 10:59:55 +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