Mercurial > hg
view tests/test-copy-move-merge @ 9861:0262bb59016f
support encoding fallback in branchmap to maintain compatibility with 1.3.x
author | Henrik Stuart <henrik.stuart@edlund.dk> |
---|---|
date | Mon, 16 Nov 2009 13:35:36 +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