Mercurial > hg
comparison mercurial/merge.py @ 11466:ad27428c59ce stable
update: synchronize permissions in the dirstate (issue1473)
fix by Benoit, updated by mpm to not affect all clean files
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 30 Jun 2010 17:34:20 -0500 |
| parents | 9b0406b23be0 |
| children | 34e33d50c26b |
comparison
equal
deleted
inserted
replaced
| 11465:ace5bd98bee3 | 11466:ad27428c59ce |
|---|---|
| 180 continue | 180 continue |
| 181 if f in m2: | 181 if f in m2: |
| 182 rflags = fmerge(f, f, f) | 182 rflags = fmerge(f, f, f) |
| 183 a = ma.get(f, nullid) | 183 a = ma.get(f, nullid) |
| 184 if n == m2[f] or m2[f] == a: # same or local newer | 184 if n == m2[f] or m2[f] == a: # same or local newer |
| 185 if m1.flags(f) != rflags: | 185 # is file locally modified or flags need changing? |
| 186 # dirstate flags may need to be made current | |
| 187 if m1.flags(f) != rflags or n[20:]: | |
| 186 act("update permissions", "e", f, rflags) | 188 act("update permissions", "e", f, rflags) |
| 187 elif n == a: # remote newer | 189 elif n == a: # remote newer |
| 188 act("remote is newer", "g", f, rflags) | 190 act("remote is newer", "g", f, rflags) |
| 189 else: # both changed | 191 else: # both changed |
| 190 act("versions differ", "m", f, f, f, rflags, False) | 192 act("versions differ", "m", f, f, f, rflags, False) |