tests/test-rename-dir-merge
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Sat, 03 Nov 2007 11:11:13 +0100
changeset 5663 99fdef2e6793
parent 5567 56e9f7b2d8fa
child 8167 6c82beaaa11a
permissions -rwxr-xr-x
Add output markers to test-bundle so it's easier to spot the source of output diffs.

#!/bin/sh

mkdir t
cd t
hg init

mkdir a
echo foo > a/a
echo bar > a/b
hg ci -Am "0" -d "0 0"

hg co -C 0
hg mv a b
hg ci -m "1 mv a/ b/" -d "0 0"

hg co -C 0
echo baz > a/c
echo quux > a/d
hg add a/c
hg ci -m "2 add a/c" -d "0 0"

hg merge --debug 1
echo a/* b/*
hg st -C
hg ci -m "3 merge 2+1" -d "0 0"
hg debugrename b/c

hg co -C 1
hg merge --debug 2
echo a/* b/*
hg st -C
hg ci -m "4 merge 1+2" -d "0 0"
hg debugrename b/c