Mercurial > hg
view tests/test-copy-move-merge @ 5083:f94dbc6c7eaf
Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it.
author | Eric Hopper <hopper@omnifarious.org> |
---|---|
date | Wed, 08 Aug 2007 22:47:30 +0200 |
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