Show More
@@ -191,8 +191,7 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
191 | act("clobbering", "g", f, rflags) |
|
191 | act("clobbering", "g", f, rflags) | |
192 | # or are we going back in time and clean? |
|
192 | # or are we going back in time and clean? | |
193 | elif backwards: |
|
193 | elif backwards: | |
194 | if not n[20:] or not p2[f].cmp(p1[f].data()): |
|
194 | act("reverting", "g", f, rflags) | |
195 | act("reverting", "g", f, rflags) |
|
|||
196 | else: |
|
195 | else: | |
197 | act("remote is newer", "g", f, rflags) |
|
196 | act("remote is newer", "g", f, rflags) | |
198 | # local is newer, not overwrite, check mode bits |
|
197 | # local is newer, not overwrite, check mode bits |
General Comments 0
You need to be logged in to leave comments.
Login now