Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/hg.py @ 3387:ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
- we don't actually need the context in recordupdates
- use -1 for filesize to force check on normal update
- only record copy for branchmerges
- forget moved files on update
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 13 Oct 2006 17:58:04 -0500 |
| parents | 39fd6e82ea38 |
| children | 145a8fde69e6 |