changeset 12113 | d171000cf6f8 |
parent 12112 | d27d5ae576a2 |
child 12114 | 0a6b2e21bc86 |
--- a/tests/test-rename-dir-merge2 Mon Aug 30 13:49:40 2010 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -#!/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