Mercurial > hg
view tests/test-convert-hg-source.out @ 6031:7383384793fb
revert: don't assume ignored files will be returned in the unknown list
That's just an artifact of the current implementation, and I'll change
that soon.
Bonus points:
- we don't care about the unknown list at all
- we don't print an extra message if we try to revert a removed file
that is not present in the target revision
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 08 Feb 2008 18:07:55 -0200 |
| parents | 11e1e574da02 |
| children | 180a3eee4b75 |
line wrap: on
line source
merging baz and foo 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved merging foo and baz 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) initializing destination new repository scanning source... sorting... converting... 4 add foo bar 3 change foo 2 make bar and baz copies of foo 1 merge local copy 0 merge remote copy comparing with ../orig searching for changes no changes found