Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-addremove.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 | ff3ea21a981a |
children |
line wrap: on
line source
adding dir/bar adding foo dir/bar foo adding dir/bar_2 adding foo_2 dir/bar_2 foo_2 adding a adding c adding b adding d removing a removing c recording removal of a as rename to b (100% similar)