view tests/test-rename-dir-merge @ 6313:c5580db9c3aa

remoterepo: no longer needed All users already use repo.local() to test for local, which is false in the repository base class. statichttprepository never derived from this class anyway.
author Matt Mackall <mpm@selenic.com>
date Thu, 20 Mar 2008 11:12:35 -0500
parents 56e9f7b2d8fa
children 6c82beaaa11a
line wrap: on
line source

#!/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