comparison tests/test-copy2.out @ 1117:30ab5b8ee8ec

fix some rename/copy bugs - delete copy information when we update dirstate hg was keeping the copy state and marking things as copied on multiple commits - files that are renamed should have no parents if you do a rename/copy to an existing file, it should not be marked as descending from its previous revisions. - remove spurious print from filelog.renamed - add some more copy tests
author mpm@selenic.com
date Sat, 27 Aug 2005 22:04:17 -0700
parents
children 19b048da4da9
comparison
equal deleted inserted replaced
1116:0cdd73b0767c 1117:30ab5b8ee8ec
1 # should show copy
2 a 644 4 08/28/05 05:00:19 bar
3 n 644 4 08/28/05 05:00:19 foo
4
5 foo -> bar
6 # shouldn't show copy
7 n 644 4 08/28/05 05:00:19 bar
8 n 644 4 08/28/05 05:00:19 foo
9
10 # should match
11 rev offset length base linkrev nodeid p1 p2
12 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000
13 renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
14 # should not be renamed
15 not renamed
16 # should show copy
17 n 644 5 08/28/05 05:00:19 bar
18 n 644 6 08/28/05 05:00:19 foo
19
20 foo -> bar
21 # should show no parents for tip
22 rev offset length base linkrev nodeid p1 p2
23 0 0 69 0 1 6ca237634e1f 000000000000 000000000000
24 1 69 6 1 2 7a1ff8e75f5b 6ca237634e1f 000000000000
25 2 75 82 1 3 243dfe60f3d9 000000000000 000000000000
26 # should match
27 rev offset length base linkrev nodeid p1 p2
28 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000
29 1 5 7 1 2 dd12c926cf16 2ed2a3912a0b 000000000000
30 renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17
31 # should show no copies
32 n 644 6 08/28/05 05:00:19 bar
33 n 644 6 08/28/05 05:00:19 foo
34