Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-git-import.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 | b70740aefa4d |
children | 1c9b6f1237e0 |
line wrap: on
line source
% new file applying patch from stdin % chmod +x applying patch from stdin % copy applying patch from stdin a a % rename applying patch from stdin copyx new rename % delete applying patch from stdin new rename % regular diff applying patch from stdin % copy and modify applying patch from stdin a a b a a % rename and modify applying patch from stdin copy2: No such file or directory a a b c a