Show More
@@ -136,24 +136,17 b' def manifestmerge(repo, p1, p2, pa, over' | |||
|
136 | 136 | action = [] |
|
137 | 137 | copy, copied, diverge = {}, {}, {} |
|
138 | 138 | |
|
139 |
def fmerge(f, f2 |
|
|
139 | def fmerge(f, f2, fa): | |
|
140 | 140 | """merge flags""" |
|
141 | if not f2: | |
|
142 | f2 = f | |
|
143 | fa = f | |
|
144 | 141 | a, m, n = ma.flags(fa), m1.flags(f), m2.flags(f2) |
|
145 | 142 | if m == n: # flags agree |
|
146 | 143 | return m # unchanged |
|
147 |
if m and n: # flags |
|
|
148 | if not a: # both differ from parent | |
|
144 | if m and n and not a: # flags set, don't agree, differ from parent | |
|
149 | 145 |
|
|
150 | 146 |
|
|
151 | 147 |
|
|
152 | 148 |
|
|
153 | 149 |
|
|
154 | if m == a: | |
|
155 | return n # changed from m to n | |
|
156 | return m # changed from n to m | |
|
157 | 150 | if m and m != a: # changed from a to m |
|
158 | 151 | return m |
|
159 | 152 | if n and n != a: # changed from a to n |
@@ -180,7 +173,7 b' def manifestmerge(repo, p1, p2, pa, over' | |||
|
180 | 173 | if overwrite or backwards: |
|
181 | 174 | rflags = m2.flags(f) |
|
182 | 175 | else: |
|
183 | rflags = fmerge(f) | |
|
176 | rflags = fmerge(f, f, f) | |
|
184 | 177 | # are files different? |
|
185 | 178 | if n != m2[f]: |
|
186 | 179 | a = ma.get(f, nullid) |
General Comments 0
You need to be logged in to leave comments.
Login now