tests/test-merge1.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 09 Aug 2005 11:32:30 +0100
changeset 861 cbe5c4d016b7
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
dirstate.changes() now distinguishes 'hg remove'd or just deleted files. Interface is not yet changed. Non-regular files are considered to be removed or deleted. Removed the unneeded match(fn) call for adding to the unknown list.

+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg update 0
+ hg add c
+ hg commit -m commit #2 -d 0 0
+ hg update -m 1
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg update 0
+ hg add c
+ hg commit -m commit #2 -d 0 0
+ hg update -m 1
merging for b
merging b
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg commit -m commit #2 -d 0 0
+ hg update 1
+ hg add c
+ hg commit -m commit #3 -d 0 0
This is file b1
+ hg update -m 2
merging for b
merging b
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg commit -m commit #2 -d 0 0
+ hg update 1
+ hg add c
+ hg commit -m commit #3 -d 0 0
+ hg update -m 2
merging for b
merging b