Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-mq-qdelete.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 | dc784839516d |
children | b9a7c07fca0e |
line wrap: on
line source
adding base abort: cannot delete applied patch c Now at: b a b a b series status Now at: a a b series status 1 New patch: a 0 base abort: patch e not at base f 4 New patch: f 3 New patch: e 2 New patch: d 1 New patch: a 0 base