mercurial-crew-with-dirclash: tests/test-merge2.out@122449dd89db

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

author	mpm@selenic.com
	Tue, 26 Jul 2005 19:23:59 -0800
changeset 775	122449dd89db
parent 767	61ed30e82b27
child 801	1f9ec150a476
child 808	8f5637f0a0c0
child 814	0902ffece4b4
permissions	-rw-r--r--


+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ rm b
+ hg update 0
+ echo This is file b2
+ hg add b
+ hg commit -m 'commit #2' -d '0 0'
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ rm b
+ hg update 0
+ echo This is file b2
+ hg commit -A -m 'commit #2' -d '0 0'
adding b
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ rm b
+ hg remove b
+ hg update 0
+ echo This is file b2
+ hg commit -A -m 'commit #2' -d '0 0'
adding b
+ cd ..
+ /bin/rm -rf t