Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-copy2.out @ 4779:37e11c768db9
merge with crew-stable
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 03 Jul 2007 03:14:18 -0300 |
parents | 44e17f5029d0 |
children | fc8b3e7cbf6b |
comparison
equal
deleted
inserted
replaced
4774:38bf55d2e41f | 4779:37e11c768db9 |
---|---|
1 # should fail - foo is not managed | |
2 foo: not copying - file is not managed | |
3 abort: no files to copy | |
4 ? foo | |
5 # dry-run; print a warning that this is not a real copy; foo is added | |
6 foo was marked for addition. bar will not be committed as a copy. | |
7 A foo | |
8 # should print a warning that this is not a real copy; bar is added | |
9 foo was marked for addition. bar will not be committed as a copy. | |
10 A bar | |
11 # should print a warning that this is not a real copy; foo is added | |
12 bar was marked for addition. foo will not be committed as a copy. | |
13 A foo | |
14 # dry-run; should show that foo is clean | |
15 C foo | |
1 # should show copy | 16 # should show copy |
2 copy: foo -> bar | 17 A bar |
18 foo | |
3 # shouldn't show copy | 19 # shouldn't show copy |
4 # should match | 20 # should match |
5 rev offset length base linkrev nodeid p1 p2 | 21 rev offset length base linkrev nodeid p1 p2 |
6 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 | 22 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 |
7 bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd | 23 bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
8 # should not be renamed | 24 # should not be renamed |
9 bar not renamed | 25 bar not renamed |
10 # should show copy | 26 # should show copy |
11 copy: foo -> bar | 27 M bar |
28 foo | |
12 # should show no parents for tip | 29 # should show no parents for tip |
13 rev offset length base linkrev nodeid p1 p2 | 30 rev offset length base linkrev nodeid p1 p2 |
14 0 0 69 0 1 6ca237634e1f 000000000000 000000000000 | 31 0 0 69 0 1 6ca237634e1f 000000000000 000000000000 |
15 1 69 6 1 2 7a1ff8e75f5b 6ca237634e1f 000000000000 | 32 1 69 6 1 2 7a1ff8e75f5b 6ca237634e1f 000000000000 |
16 2 75 82 1 3 243dfe60f3d9 000000000000 000000000000 | 33 2 75 82 1 3 243dfe60f3d9 000000000000 000000000000 |