Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/hg.py @ 764:eea96285cbf9
Don't mark files with 'm'erge unless we're actually merging branches
For 3-way merges, we were marking files as 'm', which should only be
used for branch merges. This was causing files to show up in 'hg
status' that aren't actually modified.
| author | mpm@selenic.com |
|---|---|
| date | Fri, 22 Jul 2005 19:23:00 -0500 |
| parents | 8760d0c83b9b |
| children | 1e31d97c3d70 |
comparison
equal
deleted
inserted
replaced
| 763:84f9ac74cc30 | 764:eea96285cbf9 |
|---|---|
| 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: |
| 1510 self.dirstate.update([f], 'm') | 1510 self.dirstate.update([f], mode) |
| 1511 | 1511 |
| 1512 remove.sort() | 1512 remove.sort() |
| 1513 for f in remove: | 1513 for f in remove: |
| 1514 self.ui.note("removing %s\n" % f) | 1514 self.ui.note("removing %s\n" % f) |
| 1515 try: | 1515 try: |