Mercurial > hg
view tests/test-rename-dir-merge2 @ 10811:644445eddf5c stable
Added tag 1.5.1 for changeset 2b01dab59416
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 01 Apr 2010 17:49:38 -0500 |
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