Mercurial > hg
view tests/test-rename-dir-merge2 @ 10441:dc0d1ca2d378
progress: only reset state if finishing progress for the current topic
This prevents some visual glitches when doing a clone --pull locally.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Sat, 13 Feb 2010 09:49:06 -0600 |
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