mercurial-crew-with-dirclash: tests/test-merge4@b0187336843c (annotated)

416 5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	1	#!/bin/sh -x
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	2
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	3	hg init
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	4	echo This is file a1 > a
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	5	hg add a
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	6	hg commit -t "commit #0" -d "0 0" -u user
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	7	echo This is file b1 > b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	8	hg add b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	9	hg commit -t "commit #1" -d "0 0" -u user
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	10	hg update 0
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	11	echo This is file c1 > c
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	12	hg add c
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	13	hg commit -t "commit #2" -d "0 0" -u user
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	14	hg update -m 1
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	15	rm b
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	16	echo This is file c22 > c
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches mpm@selenic.com parents: diff changeset	17	hg commit -t "commit #3" -d "0 0" -u user

author	mpm@selenic.com
	Wed, 29 Jun 2005 10:49:07 -0800
changeset 518	b0187336843c
parent 416	5e9e8b8d2629
child 749	7e4843b7efd2
permissions	-rwxr-xr-x