changeset 5489 | 3ab405e070bb |
parent 5434 | f9c2917a9f7a |
child 5570 | 78a6b985882f |
child 5670 | 840e2b315c1f |
--- a/mercurial/merge.py Mon Nov 05 20:15:33 2007 +0100 +++ b/mercurial/merge.py Mon Nov 05 18:49:35 2007 -0200 @@ -401,7 +401,10 @@ act("update permissions", "e", f, m2.flags(f)) # contents same, check mode bits elif m1.flags(f) != m2.flags(f): - if overwrite or fmerge(f) != m1.flags(f): + # are we clobbering? + # is remote's version newer? + # or are we going back? + if overwrite or fmerge(f) != m1.flags(f) or backwards: act("update permissions", "e", f, m2.flags(f)) elif f in copied: continue