equal
deleted
inserted
replaced
171 return "l" # Symlink |
171 return "l" # Symlink |
172 return "" |
172 return "" |
173 if m and m != a: # changed from a to m |
173 if m and m != a: # changed from a to m |
174 return m |
174 return m |
175 if n and n != a: # changed from a to n |
175 if n and n != a: # changed from a to n |
|
176 if n == 'l' or a == 'l': |
|
177 # can't automatically merge symlink flag change here, let |
|
178 # filemerge take care of it |
|
179 return m |
176 return n |
180 return n |
177 return '' # flag was cleared |
181 return '' # flag was cleared |
178 |
182 |
179 def act(msg, m, f, *args): |
183 def act(msg, m, f, *args): |
180 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
184 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
357 else: |
361 else: |
358 if r is None: |
362 if r is None: |
359 updated += 1 |
363 updated += 1 |
360 else: |
364 else: |
361 merged += 1 |
365 merged += 1 |
362 util.setflags(repo.wjoin(fd), 'l' in flags, 'x' in flags) |
|
363 if (move and repo.dirstate.normalize(fd) != f |
366 if (move and repo.dirstate.normalize(fd) != f |
364 and os.path.lexists(repo.wjoin(f))): |
367 and os.path.lexists(repo.wjoin(f))): |
365 repo.ui.debug("removing %s\n" % f) |
368 repo.ui.debug("removing %s\n" % f) |
366 audit(f) |
369 audit(f) |
367 os.unlink(repo.wjoin(f)) |
370 os.unlink(repo.wjoin(f)) |