Mercurial > hg
view tests/test-copy-move-merge @ 9789:79e749b26b2b
Use utf-8 encoding in test-branchmap's clone call
After 75520c24feda it is printed in local encoding, i.e. "C" if not set
otherwise.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 07 Nov 2009 23:38:01 +0100 |
parents | 8d9bdcbb2b18 |
children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo 1 > a hg ci -qAm "first" -d "1000000 0" hg cp a b hg mv a c echo 2 >> b echo 2 >> c hg ci -qAm "second" -d "1000000 0" hg co -C 0 echo 0 > a echo 1 >> a hg ci -qAm "other" -d "1000000 0" hg merge --debug echo "-- b --" cat b echo "-- c --" cat c