Show More
@@ -133,6 +133,10 def manifestmerge(repo, p1, p2, pa, over | |||
|
133 | 133 | m2 = p2.manifest() |
|
134 | 134 | ma = pa.manifest() |
|
135 | 135 | backwards = (pa == p2) |
|
136 | ||
|
137 | if backwards or overwrite: | |
|
138 | ma = m1 | |
|
139 | ||
|
136 | 140 | action = [] |
|
137 | 141 | copy, copied, diverge = {}, {}, {} |
|
138 | 142 | |
@@ -209,7 +213,7 def manifestmerge(repo, p1, p2, pa, over | |||
|
209 | 213 | else: # case 4,21 A/B/B |
|
210 | 214 | act("local moved to " + f2, "m", |
|
211 | 215 | f, f2, f, fmerge(f, f2, f2), False) |
|
212 | elif f in ma: | |
|
216 | elif f in ma and not n[20:]: | |
|
213 | 217 | if n != ma[f] and not overwrite: |
|
214 | 218 | if repo.ui.prompt( |
|
215 | 219 | _(" local changed %s which remote deleted\n" |
@@ -38,7 +38,7 summary: 2 | |||
|
38 | 38 | resolving manifests |
|
39 | 39 | overwrite False partial False |
|
40 | 40 | ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b |
|
41 |
b: |
|
|
41 | b: other deleted -> r | |
|
42 | 42 | removing b |
|
43 | 43 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
44 | 44 | changeset: 0:33aaa84a386b |
@@ -43,8 +43,8 side2 | |||
|
43 | 43 | resolving manifests |
|
44 | 44 | overwrite True partial False |
|
45 | 45 | ancestor 537353581d3d local ded32b0db104+ remote 221226fb2bd8 |
|
46 |
side2: |
|
|
47 |
side1: |
|
|
46 | side2: other deleted -> r | |
|
47 | side1: other deleted -> r | |
|
48 | 48 | main: remote created -> g |
|
49 | 49 | removing side1 |
|
50 | 50 | removing side2 |
General Comments 0
You need to be logged in to leave comments.
Login now