Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 3113:f96c8e219865
merge: remove no longer possible clause
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 18:28:50 -0500 |
parents | 5cc62d99b785 |
children | d1d1cd5b9484 |
comparison
equal
deleted
inserted
replaced
3112:5cc62d99b785 | 3113:f96c8e219865 |
---|---|
131 # or are we going back in time and clean? | 131 # or are we going back in time and clean? |
132 elif overwrite or m2[f] != a or (backwards and not n[20:]): | 132 elif overwrite or m2[f] != a or (backwards and not n[20:]): |
133 ui.debug(_(" remote %s is newer, get\n") % f) | 133 ui.debug(_(" remote %s is newer, get\n") % f) |
134 action.append((f, "g", m2.execf(f), m2[f])) | 134 action.append((f, "g", m2.execf(f), m2[f])) |
135 queued = 1 | 135 queued = 1 |
136 elif n[20:] in ("u","a"): | |
137 # this unknown file is the same as the checkout | |
138 # we need to reset the dirstate if the file was added | |
139 action.append((f, "g", m2.execf(f), m2[f])) | |
140 | 136 |
141 # do we still need to look at mode bits? | 137 # do we still need to look at mode bits? |
142 if not queued and m1.execf(f) != m2.execf(f): | 138 if not queued and m1.execf(f) != m2.execf(f): |
143 if overwrite: | 139 if overwrite: |
144 ui.debug(_(" updating permissions for %s\n") % f) | 140 ui.debug(_(" updating permissions for %s\n") % f) |