Show More
@@ -88,12 +88,9 b' def update(repo, node, branchmerge=False' | |||||
88 | if modified or added or removed: |
|
88 | if modified or added or removed: | |
89 | raise util.Abort(_("outstanding uncommitted changes")) |
|
89 | raise util.Abort(_("outstanding uncommitted changes")) | |
90 |
|
90 | |||
91 | m1n = repo.changelog.read(p1)[0] |
|
91 | m1 = repo.changectx(p1).manifest().copy() | |
92 | m2n = repo.changelog.read(p2)[0] |
|
92 | m2 = repo.changectx(p2).manifest().copy() | |
93 |
ma |
|
93 | ma = repo.changectx(pa).manifest() | |
94 | m1 = repo.manifest.read(m1n).copy() |
|
|||
95 | m2 = repo.manifest.read(m2n).copy() |
|
|||
96 | ma = repo.manifest.read(man) |
|
|||
97 |
|
94 | |||
98 | if not force: |
|
95 | if not force: | |
99 | for f in unknown: |
|
96 | for f in unknown: | |
@@ -108,7 +105,7 b' def update(repo, node, branchmerge=False' | |||||
108 | repo.ui.debug(_(" overwrite %s branchmerge %s partial %s linear %s\n") % |
|
105 | repo.ui.debug(_(" overwrite %s branchmerge %s partial %s linear %s\n") % | |
109 | (overwrite, branchmerge, bool(partial), linear_path)) |
|
106 | (overwrite, branchmerge, bool(partial), linear_path)) | |
110 | repo.ui.debug(_(" ancestor %s local %s remote %s\n") % |
|
107 | repo.ui.debug(_(" ancestor %s local %s remote %s\n") % | |
111 |
(short( |
|
108 | (short(p1), short(p2), short(pa))) | |
112 |
|
109 | |||
113 | action = {} |
|
110 | action = {} | |
114 | forget = [] |
|
111 | forget = [] |
@@ -23,7 +23,7 b' added 1 changesets with 1 changes to 1 f' | |||||
23 | merge: warning: conflicts during merge |
|
23 | merge: warning: conflicts during merge | |
24 | resolving manifests |
|
24 | resolving manifests | |
25 | overwrite None branchmerge True partial False linear False |
|
25 | overwrite None branchmerge True partial False linear False | |
26 | ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20 |
|
26 | ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9 | |
27 | test.txt versions differ, resolve |
|
27 | test.txt versions differ, resolve | |
28 | merging test.txt |
|
28 | merging test.txt | |
29 | resolving test.txt |
|
29 | resolving test.txt |
@@ -16,7 +16,7 b' summary: 1' | |||||
16 |
|
16 | |||
17 | resolving manifests |
|
17 | resolving manifests | |
18 | overwrite False branchmerge False partial False linear True |
|
18 | overwrite False branchmerge False partial False linear True | |
19 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
|
19 | ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b | |
20 | a versions differ, resolve |
|
20 | a versions differ, resolve | |
21 | remote created b |
|
21 | remote created b | |
22 | merging a |
|
22 | merging a | |
@@ -32,7 +32,7 b' summary: 2' | |||||
32 |
|
32 | |||
33 | resolving manifests |
|
33 | resolving manifests | |
34 | overwrite False branchmerge False partial False linear True |
|
34 | overwrite False branchmerge False partial False linear True | |
35 | ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c |
|
35 | ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b | |
36 | remote deleted b |
|
36 | remote deleted b | |
37 | removing b |
|
37 | removing b | |
38 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
38 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
@@ -50,7 +50,7 b' summary: 1' | |||||
50 |
|
50 | |||
51 | resolving manifests |
|
51 | resolving manifests | |
52 | overwrite False branchmerge False partial False linear True |
|
52 | overwrite False branchmerge False partial False linear True | |
53 | ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e |
|
53 | ancestor 33aaa84a386b local 802f095af299 remote 33aaa84a386b | |
54 | a versions differ, resolve |
|
54 | a versions differ, resolve | |
55 | remote created b |
|
55 | remote created b | |
56 | merging a |
|
56 | merging a | |
@@ -101,7 +101,7 b' abort: outstanding uncommitted changes' | |||||
101 | failed |
|
101 | failed | |
102 | resolving manifests |
|
102 | resolving manifests | |
103 | overwrite False branchmerge True partial False linear False |
|
103 | overwrite False branchmerge True partial False linear False | |
104 | ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392 |
|
104 | ancestor 802f095af299 local 030602aee63d remote 33aaa84a386b | |
105 | a versions differ, resolve |
|
105 | a versions differ, resolve | |
106 | b versions differ, resolve |
|
106 | b versions differ, resolve | |
107 | merging a |
|
107 | merging a |
@@ -41,7 +41,7 b' side1' | |||||
41 | side2 |
|
41 | side2 | |
42 | resolving manifests |
|
42 | resolving manifests | |
43 | overwrite True branchmerge False partial False linear False |
|
43 | overwrite True branchmerge False partial False linear False | |
44 | ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae |
|
44 | ancestor ded32b0db104 local 221226fb2bd8 remote 537353581d3d | |
45 | remote deleted side2, clobbering |
|
45 | remote deleted side2, clobbering | |
46 | remote deleted side1, clobbering |
|
46 | remote deleted side1, clobbering | |
47 | remote created main |
|
47 | remote created main |
General Comments 0
You need to be logged in to leave comments.
Login now