Mercurial > hg
comparison tests/test-merge-revert2.out @ 2029:d436b21b20dc
rewrite revert command. fix issues 93, 123, 147.
new version does these things:
- saves backup copies of modified files (issue 147)
- prints output like other commands, and errors when files not found
(issue 123)
- marks files added/removed (issue 93)
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Fri, 31 Mar 2006 10:37:25 -0800 |
| parents | 7544700fd931 |
| children | b2ae81a7df29 |
comparison
equal
deleted
inserted
replaced
| 2028:1f1fc418a96c | 2029:d436b21b20dc |
|---|---|
| 1 1:f248da0d4c3e | 1 1:f248da0d4c3e |
| 2 0:9eca13a34789 | 2 0:9eca13a34789 |
| 3 f248da0d4c3e tip | 3 f248da0d4c3e tip |
| 4 9eca13a34789 | 4 9eca13a34789 |
| 5 9eca13a34789+ | 5 9eca13a34789+ |
| 6 reverting file1 | |
| 6 9eca13a34789 | 7 9eca13a34789 |
| 7 f248da0d4c3e tip | 8 f248da0d4c3e tip |
| 8 merge: warning: conflicts during merge | 9 merge: warning: conflicts during merge |
| 9 merging file1 | 10 merging file1 |
| 10 merging file1 failed! | 11 merging file1 failed! |
| 19 +======= | 20 +======= |
| 20 changed file1 | 21 changed file1 |
| 21 +>>>>>>> | 22 +>>>>>>> |
| 22 M file1 | 23 M file1 |
| 23 f248da0d4c3e+ tip | 24 f248da0d4c3e+ tip |
| 25 reverting file1 | |
| 24 f248da0d4c3e tip | 26 f248da0d4c3e tip |
| 25 f248da0d4c3e tip | 27 f248da0d4c3e tip |
| 26 f248da0d4c3e tip | 28 f248da0d4c3e tip |