view tests/test-issue1306 @ 11346:e740f36cfb4b

tests: rename test-merge3 to test-add-remove. It tests that 'hg commit' does not crash if the user removes a newly added file, which has nothing to do with merging.
author Greg Ward <greg-hg@gerg.ca>
date Mon, 14 Jun 2010 13:39:00 -0400
parents cb93eee1fbcd
children
line wrap: on
line source

#!/bin/sh

echo % initialize remote repo with branches
hg init remote
cd remote
echo a > a
hg ci -Ama
hg branch br
hg ci -Amb
echo c > c
hg ci -Amc
hg log

cd ..
echo % try cloning -r branch
hg clone -rbr remote local1
hg -R local1 parents

echo % try cloning -rother clone#branch
hg clone -r0 remote#br local2
hg -R local2 parents

echo % try cloning -r1 clone#branch
hg clone -r1 remote#br local3
hg -R local3 parents