Mercurial > hg
comparison tests/test-merge-remove.out @ 6736:369ddc9c0339
lookup: optimize '.'
Remove error messages as behavior is documented in hg help revs
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 25 Jun 2008 17:33:34 -0500 |
| parents | 9eb274d773d9 |
| children |
comparison
equal
deleted
inserted
replaced
| 6735:8b09b0864781 | 6736:369ddc9c0339 |
|---|---|
| 21 copy: foo -> foo1 | 21 copy: foo -> foo1 |
| 22 M bar | 22 M bar |
| 23 M foo1 | 23 M foo1 |
| 24 foo | 24 foo |
| 25 % reverting foo1 and bar | 25 % reverting foo1 and bar |
| 26 warning: working directory has two parents, tag '.' uses the first | |
| 27 saving current version of bar as bar.orig | 26 saving current version of bar as bar.orig |
| 28 reverting bar | 27 reverting bar |
| 29 saving current version of foo1 as foo1.orig | 28 saving current version of foo1 as foo1.orig |
| 30 reverting foo1 | 29 reverting foo1 |
| 31 n 0 -2 bar | 30 n 0 -2 bar |