Mercurial > hg
view tests/test-add.out @ 5900:1206e3dfc906
repair.py: nodes are nodes, revs are revs
Use "striprev" instead of just "rev" to make the patch a bit less
confusing. This is also a bit clearer than just "revnum".
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 19 Jan 2008 18:01:16 -0200 |
parents | 883d887c6408 |
children | 5af5f0f9d724 |
line wrap: on
line source
adding a ? a adding a A a A a ? b A a A b % should fail b already tracked! A a A b % should fail a already tracked! 1 files updated, 0 files merged, 0 files removed, 0 files unresolved warning: conflicts during merge. merging a merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge using: hg update -C 2 hg merge 1 M a % should fail a already tracked! M a % issue683 R a M a c does not exist! d does not exist! M a A c