tests/test-merge1.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 08:23:42 +0100
changeset 864 6225bd773c51
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
Extended test case to test dirstate length bug fixed in a7e95e3606c7.

+ 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