Show More
@@ -133,10 +133,9 b' def manifestmerge(ui, m1, m2, ma, overwr' | |||||
133 | elif fmerge(f) != m1.execf(f): |
|
133 | elif fmerge(f) != m1.execf(f): | |
134 | ui.debug(_(" updating permissions for %s\n") % f) |
|
134 | ui.debug(_(" updating permissions for %s\n") % f) | |
135 | action.append((f, "e", m2.execf(f))) |
|
135 | action.append((f, "e", m2.execf(f))) | |
136 |
|
||||
137 | # contents same, check mode bits |
|
136 | # contents same, check mode bits | |
138 | elif m1.execf(f) != m2.execf(f): |
|
137 | elif m1.execf(f) != m2.execf(f): | |
139 | if overwrite or fmerge(f) != m1.execf(f) |
|
138 | if overwrite or fmerge(f) != m1.execf(f): | |
140 | ui.debug(_(" updating permissions for %s\n") % f) |
|
139 | ui.debug(_(" updating permissions for %s\n") % f) | |
141 | action.append((f, "e", m2.execf(f))) |
|
140 | action.append((f, "e", m2.execf(f))) | |
142 | del m2[f] |
|
141 | del m2[f] | |
@@ -151,17 +150,11 b' def manifestmerge(ui, m1, m2, ma, overwr' | |||||
151 | action.append((f, "r")) |
|
150 | action.append((f, "r")) | |
152 | else: |
|
151 | else: | |
153 | # file is created on branch or in working directory |
|
152 | # file is created on branch or in working directory | |
154 | if overwrite and n[20:] != "u": |
|
153 | if (overwrite and n[20:] != "u") or (backwards and not n[20:]): | |
155 | ui.debug(_("remote deleted %s, clobbering\n") % f) |
|
154 | ui.debug(_("remote deleted %s, clobbering\n") % f) | |
156 | action.append((f, "r")) |
|
155 | action.append((f, "r")) | |
157 | elif not n[20:]: # same as parent |
|
|||
158 | if backwards: |
|
|||
159 | ui.debug(_("remote deleted %s\n") % f) |
|
|||
160 | action.append((f, "r")) |
|
|||
161 |
|
|
156 | else: | |
162 |
|
|
157 | ui.debug(_("local created %s, keeping\n") % f) | |
163 | else: |
|
|||
164 | ui.debug(_("working dir created %s, keeping\n") % f) |
|
|||
165 |
|
158 | |||
166 | for f, n in m2.iteritems(): |
|
159 | for f, n in m2.iteritems(): | |
167 | if f in ma: |
|
160 | if f in ma: |
@@ -33,7 +33,7 b' summary: 2' | |||||
33 | resolving manifests |
|
33 | resolving manifests | |
34 | overwrite False branchmerge False partial False |
|
34 | overwrite False branchmerge False partial False | |
35 | ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b |
|
35 | ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b | |
36 | remote deleted b |
|
36 | remote deleted b, clobbering | |
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 | |
39 | changeset: 0:33aaa84a386b |
|
39 | changeset: 0:33aaa84a386b |
General Comments 0
You need to be logged in to leave comments.
Login now