Mercurial > hg
comparison tests/test-merge-commit.out @ 4058:e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 30 Jan 2007 19:09:08 -0200 |
parents | |
children | 17ed9b9a0d03 |
comparison
equal
deleted
inserted
replaced
4057:3600b84656d3 | 4058:e7282dede8cd |
---|---|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 merging bar and foo | |
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
4 (branch merge, don't forget to commit) | |
5 % contents of bar should be line0 line1 line2 | |
6 line0 | |
7 line1 | |
8 line2 | |
9 rev offset length base linkrev nodeid p1 p2 | |
10 0 0 77 0 2 da78c0659611 000000000000 000000000000 | |
11 1 77 76 0 3 4b358025380b 000000000000 da78c0659611 | |
12 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 | |
13 rev offset length base linkrev nodeid p1 p2 | |
14 0 0 7 0 0 690b295714ae 000000000000 000000000000 | |
15 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 | |
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
17 4:2d2f9a22c82b 2:0a3ab4856510 | |
18 3:7d3b554bfdf1 2:0a3ab4856510 1:5cd961e4045d | |
19 2:0a3ab4856510 0:2665aaee66e9 | |
20 1:5cd961e4045d | |
21 0:2665aaee66e9 | |
22 % this should use bar@rev2 as the ancestor | |
23 resolving manifests | |
24 overwrite None partial False | |
25 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1 | |
26 bar: versions differ -> m | |
27 merging bar | |
28 my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510 | |
29 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
30 (branch merge, don't forget to commit) | |
31 % contents of bar should be line1 line2 | |
32 line1 | |
33 line2 | |
34 rev offset length base linkrev nodeid p1 p2 | |
35 0 0 77 0 2 da78c0659611 000000000000 000000000000 | |
36 1 77 76 0 3 4b358025380b 000000000000 da78c0659611 | |
37 2 153 7 2 4 4defe5eec418 da78c0659611 000000000000 | |
38 3 160 13 3 5 4663501da27b 4defe5eec418 4b358025380b | |
39 | |
40 | |
41 requesting all changes | |
42 adding changesets | |
43 adding manifests | |
44 adding file changes | |
45 added 3 changesets with 3 changes to 2 files (+1 heads) | |
46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
47 merging foo and bar | |
48 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
49 (branch merge, don't forget to commit) | |
50 % contents of bar should be line0 line1 line2 | |
51 line0 | |
52 line1 | |
53 line2 | |
54 rev offset length base linkrev nodeid p1 p2 | |
55 0 0 77 0 2 da78c0659611 000000000000 000000000000 | |
56 1 77 76 0 3 4b358025380b 000000000000 da78c0659611 | |
57 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 | |
58 rev offset length base linkrev nodeid p1 p2 | |
59 0 0 7 0 0 690b295714ae 000000000000 000000000000 | |
60 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 | |
61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
62 4:2d2f9a22c82b 2:0a3ab4856510 | |
63 3:96ab80c60897 1:5cd961e4045d 2:0a3ab4856510 | |
64 2:0a3ab4856510 0:2665aaee66e9 | |
65 1:5cd961e4045d | |
66 0:2665aaee66e9 | |
67 % this should use bar@rev2 as the ancestor | |
68 resolving manifests | |
69 overwrite None partial False | |
70 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897 | |
71 bar: versions differ -> m | |
72 merging bar | |
73 my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510 | |
74 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
75 (branch merge, don't forget to commit) | |
76 % contents of bar should be line1 line2 | |
77 line1 | |
78 line2 | |
79 rev offset length base linkrev nodeid p1 p2 | |
80 0 0 77 0 2 da78c0659611 000000000000 000000000000 | |
81 1 77 76 0 3 4b358025380b 000000000000 da78c0659611 | |
82 2 153 7 2 4 4defe5eec418 da78c0659611 000000000000 | |
83 3 160 13 3 5 4663501da27b 4defe5eec418 4b358025380b |