Show More
@@ -251,7 +251,7 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
251 | elif nol and n2 == a: # remote only changed 'x' |
|
251 | elif nol and n2 == a: # remote only changed 'x' | |
252 | act("update permissions", "e", f, fl2) |
|
252 | act("update permissions", "e", f, fl2) | |
253 | elif nol and n == a: # local only changed 'x' |
|
253 | elif nol and n == a: # local only changed 'x' | |
254 | act("remote is newer", "g", f, fl) |
|
254 | act("remote is newer", "g", f, fl1) | |
255 | else: # both changed something |
|
255 | else: # both changed something | |
256 | act("versions differ", "m", f, f, f, False) |
|
256 | act("versions differ", "m", f, f, f, False) | |
257 | elif f in copied: # files we'll deal with on m2 side |
|
257 | elif f in copied: # files we'll deal with on m2 side |
@@ -197,6 +197,26 b" Test removed 'x' flag merged with change" | |||||
197 | f is a plain file with content: |
|
197 | f is a plain file with content: | |
198 | f |
|
198 | f | |
199 |
|
199 | |||
|
200 | Test removed 'x' flag merged with content change - both ways | |||
|
201 | ||||
|
202 | $ hg up -Cqr0 | |||
|
203 | $ echo change > f | |||
|
204 | $ hg ci -qm3 | |||
|
205 | $ hg merge -r1 | |||
|
206 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
207 | (branch merge, don't forget to commit) | |||
|
208 | $ tellmeabout f | |||
|
209 | f is a plain file with content: | |||
|
210 | change | |||
|
211 | ||||
|
212 | $ hg up -qCr1 | |||
|
213 | $ hg merge -r3 | |||
|
214 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
215 | (branch merge, don't forget to commit) | |||
|
216 | $ tellmeabout f | |||
|
217 | f is a plain file with content: | |||
|
218 | change | |||
|
219 | ||||
200 |
$ |
|
220 | $ cd .. | |
201 |
|
221 | |||
202 | Test merge with no common ancestor: |
|
222 | Test merge with no common ancestor: |
General Comments 0
You need to be logged in to leave comments.
Login now