Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 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 | 49988d9f0758 |
children | 41989e55fa37 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes