Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 5323:29be4228303b
verify: report first bad changeset
- add linkrev and file arguments to err
- track lowest reported linkrev in err
- find linkrev in a couple cases
- sort linkrevs when reporting a bunch of errors against a file
- tidy up lots of messages
- make more robust against damaged indexes
- report first bad changeset if an error is encountered
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 21 Sep 2007 17:18:06 -0500 |
parents | fffc8a733bf9 |
children |
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