Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/hg.py @ 768:20e95c245bc3
Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
author | mpm@selenic.com |
---|---|
date | Sat, 23 Jul 2005 10:00:56 -0500 |
parents | 1e31d97c3d70 |
children | f05deda58457 445970ccf57a |
comparison
equal
deleted
inserted
replaced
767:61ed30e82b27 | 768:20e95c245bc3 |
---|---|
1504 for f in files: | 1504 for f in files: |
1505 self.ui.status("merging %s\n" % f) | 1505 self.ui.status("merging %s\n" % f) |
1506 m, o, flag = merge[f] | 1506 m, o, flag = merge[f] |
1507 self.merge3(f, m, o) | 1507 self.merge3(f, m, o) |
1508 util.set_exec(self.wjoin(f), flag) | 1508 util.set_exec(self.wjoin(f), flag) |
1509 if moddirstate: | 1509 if moddirstate and mode == 'm': |
1510 # only update dirstate on branch merge, otherwise we | |
1511 # could mark files with changes as unchanged | |
1510 self.dirstate.update([f], mode) | 1512 self.dirstate.update([f], mode) |
1511 | 1513 |
1512 remove.sort() | 1514 remove.sort() |
1513 for f in remove: | 1515 for f in remove: |
1514 self.ui.note("removing %s\n" % f) | 1516 self.ui.note("removing %s\n" % f) |