Show More
@@ -185,8 +185,9 b' def manifestmerge(repo, p1, p2, pa, over' | |||
|
185 | 185 | if overwrite: |
|
186 | 186 | act("clobbering", "g", f, rflags) |
|
187 | 187 | # or are we going back in time and clean? |
|
188 |
elif backwards |
|
|
189 | act("reverting", "g", f, rflags) | |
|
188 | elif backwards: | |
|
189 | if not n[20:] or not p2[f].cmp(p1[f].data()): | |
|
190 | act("reverting", "g", f, rflags) | |
|
190 | 191 | # are both different from the ancestor? |
|
191 | 192 | elif n != a and m2[f] != a: |
|
192 | 193 | act("versions differ", "m", f, f, f, rflags, False) |
@@ -3,6 +3,6 b' 79abf14474dc tip' | |||
|
3 | 3 | % make sure we notice the change of mode if the cached size == -1 |
|
4 | 4 | n 0 -1 unset a |
|
5 | 5 | M a |
|
6 |
|
|
|
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
7 | 7 | d69afc33ff8a |
|
8 | 8 | not executable -- whew |
General Comments 0
You need to be logged in to leave comments.
Login now