Mercurial > hg-stable
comparison mercurial/merge.py @ 8747:9b3fd8ab3558
merge: drop a flag update case
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 08 Jun 2009 18:14:44 -0500 |
| parents | 84c44c9ed555 |
| children | f325574dad1a |
comparison
equal
deleted
inserted
replaced
| 8746:84c44c9ed555 | 8747:9b3fd8ab3558 |
|---|---|
| 179 if f in m2: | 179 if f in m2: |
| 180 rflags = fmerge(f, f, f) | 180 rflags = fmerge(f, f, f) |
| 181 # are files different? | 181 # are files different? |
| 182 if n != m2[f]: | 182 if n != m2[f]: |
| 183 a = ma.get(f, nullid) | 183 a = ma.get(f, nullid) |
| 184 # are both different from the ancestor? | |
| 185 if n != a and m2[f] != a: | |
| 186 act("versions differ", "m", f, f, f, rflags, False) | |
| 187 # is remote's version newer? | 184 # is remote's version newer? |
| 188 elif m2[f] != a: | 185 if m2[f] != a: |
| 189 act("remote is newer", "g", f, rflags) | 186 # are both different from the ancestor? |
| 190 # local is newer, not overwrite, check mode bits | 187 if n != a: |
| 191 elif m1.flags(f) != rflags: | 188 act("versions differ", "m", f, f, f, rflags, False) |
| 192 act("update permissions", "e", f, rflags) | 189 else: |
| 193 # contents same, check mode bits | 190 act("remote is newer", "g", f, rflags) |
| 194 elif m1.flags(f) != rflags: | 191 continue |
| 192 # contents don't need updating, check mode bits | |
| 193 if m1.flags(f) != rflags: | |
| 195 act("update permissions", "e", f, rflags) | 194 act("update permissions", "e", f, rflags) |
| 196 elif f in copied: | 195 elif f in copied: |
| 197 continue | 196 continue |
| 198 elif f in copy: | 197 elif f in copy: |
| 199 f2 = copy[f] | 198 f2 = copy[f] |