changeset 11972 | b708cadc6e8f |
parent 11971 | 71105dd7d4df |
child 11973 | b773ca489fd3 |
--- a/tests/test-copy-move-merge Wed Aug 18 04:21:10 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -#!/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