Mercurial > hg
comparison mercurial/merge.py @ 18360:760c0d67ce5e
merge: process files in sorted order
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Tue, 15 Jan 2013 02:59:12 +0100 |
| parents | aadefcee1f5e |
| children | 6252b4f1c4b4 |
comparison
equal
deleted
inserted
replaced
| 18359:4b09e6f7d7de | 18360:760c0d67ce5e |
|---|---|
| 226 if p1.sub(s).dirty(): | 226 if p1.sub(s).dirty(): |
| 227 m1['.hgsubstate'] += "+" | 227 m1['.hgsubstate'] += "+" |
| 228 break | 228 break |
| 229 | 229 |
| 230 # Compare manifests | 230 # Compare manifests |
| 231 for f, n in m1.iteritems(): | 231 for f, n in sorted(m1.iteritems()): |
| 232 if partial and not partial(f): | 232 if partial and not partial(f): |
| 233 continue | 233 continue |
| 234 if f in m2: | 234 if f in m2: |
| 235 n2 = m2[f] | 235 n2 = m2[f] |
| 236 fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f) | 236 fl1, fl2, fla = m1.flags(f), m2.flags(f), ma.flags(f) |
| 272 elif n[20:] == "a": # added, no remote | 272 elif n[20:] == "a": # added, no remote |
| 273 act("remote deleted", "f", f) | 273 act("remote deleted", "f", f) |
| 274 else: | 274 else: |
| 275 act("other deleted", "r", f) | 275 act("other deleted", "r", f) |
| 276 | 276 |
| 277 for f, n in m2.iteritems(): | 277 for f, n in sorted(m2.iteritems()): |
| 278 if partial and not partial(f): | 278 if partial and not partial(f): |
| 279 continue | 279 continue |
| 280 if f in m1 or f in copied: # files already visited | 280 if f in m1 or f in copied: # files already visited |
| 281 continue | 281 continue |
| 282 if f in movewithdir: | 282 if f in movewithdir: |