Mercurial > hg

comparison tests/test-merge6.t @ 12156:4c94b6d0fb1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.
author Martin Geisler <mg@lazybytes.net>
date Thu, 02 Sep 2010 23:22:51 +0200
parents 39fb1e4c079f
children ffb5c09ba822
comparison
equal deleted inserted replaced
12155:94ad12aa0530 12156:4c94b6d0fb1c
8 $ cd A1 8 $ cd A1
9 $ hg init 9 $ hg init
10 $ echo This is file foo1 > foo 10 $ echo This is file foo1 > foo
11 $ echo This is file bar1 > bar 11 $ echo This is file bar1 > bar
12 $ hg add foo bar 12 $ hg add foo bar
13 $ hg commit -m "commit text" -d "1000000 0" 13 $ hg commit -m "commit text"
14 14
15 $ cd .. 15 $ cd ..
16 $ hg clone A1 B1 16 $ hg clone A1 B1
17 updating to branch default 17 updating to branch default
18 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 18 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
19 19
20 $ cd A1 20 $ cd A1
21 $ rm bar 21 $ rm bar
22 $ hg remove bar 22 $ hg remove bar
23 $ hg commit -m "commit test" -d "1000000 0" 23 $ hg commit -m "commit test"
24 24
25 $ cd ../B1 25 $ cd ../B1
26 $ echo This is file foo22 > foo 26 $ echo This is file foo22 > foo
27 $ hg commit -m "commit test" -d "1000000 0" 27 $ hg commit -m "commit test"
28 28
29 $ cd .. 29 $ cd ..
30 $ hg clone A1 A2 30 $ hg clone A1 A2
31 updating to branch default 31 updating to branch default
32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
44 added 1 changesets with 1 changes to 1 files (+1 heads) 44 added 1 changesets with 1 changes to 1 files (+1 heads)
45 (run 'hg heads' to see heads, 'hg merge' to merge) 45 (run 'hg heads' to see heads, 'hg merge' to merge)
46 $ hg merge 46 $ hg merge
47 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 47 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
48 (branch merge, don't forget to commit) 48 (branch merge, don't forget to commit)
49 $ hg commit -m "commit test" -d "1000000 0" 49 $ hg commit -m "commit test"
50 bar should remain deleted. 50 bar should remain deleted.
51 $ hg manifest --debug 51 $ hg manifest --debug
52 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo 52 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
53 53
54 $ cd ../B2 54 $ cd ../B2
61 added 1 changesets with 0 changes to 0 files (+1 heads) 61 added 1 changesets with 0 changes to 0 files (+1 heads)
62 (run 'hg heads' to see heads, 'hg merge' to merge) 62 (run 'hg heads' to see heads, 'hg merge' to merge)
63 $ hg merge 63 $ hg merge
64 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 64 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
65 (branch merge, don't forget to commit) 65 (branch merge, don't forget to commit)
66 $ hg commit -m "commit test" -d "1000000 0" 66 $ hg commit -m "commit test"
67 bar should remain deleted. 67 bar should remain deleted.
68 $ hg manifest --debug 68 $ hg manifest --debug
69 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo 69 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo