Mercurial > hg
comparison tests/test-bookmarks.t @ 19112:23f785b38af3 stable 2.6
bookmarks: fix bug that activated a bookmark even with -r passed
If the current revision was the target revision of -r, then the bookmark would
be active. Test cases have been updated accordingly.
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Wed, 01 May 2013 15:24:21 -0500 |
| parents | 6439d78e14fb |
| children | 5b1835485442 |
comparison
equal
deleted
inserted
replaced
| 19111:6439d78e14fb | 19112:23f785b38af3 |
|---|---|
| 155 Z 0:f7b1eb17ad24 | 155 Z 0:f7b1eb17ad24 |
| 156 | 156 |
| 157 bookmarks from a revset | 157 bookmarks from a revset |
| 158 $ hg bookmark -r '.^1' REVSET | 158 $ hg bookmark -r '.^1' REVSET |
| 159 $ hg bookmark -r ':tip' TIP | 159 $ hg bookmark -r ':tip' TIP |
| 160 $ hg up -q TIP | |
| 160 $ hg bookmarks | 161 $ hg bookmarks |
| 161 REVSET 0:f7b1eb17ad24 | 162 REVSET 0:f7b1eb17ad24 |
| 162 * TIP 2:db815d6d32e6 | 163 * TIP 2:db815d6d32e6 |
| 163 X2 1:925d80f479bb | 164 X2 1:925d80f479bb |
| 164 Y 2:db815d6d32e6 | 165 Y 2:db815d6d32e6 |
| 599 $ hg bookmark Z@3 -r 3 | 600 $ hg bookmark Z@3 -r 3 |
| 600 $ hg book | 601 $ hg book |
| 601 Z 0:f7b1eb17ad24 | 602 Z 0:f7b1eb17ad24 |
| 602 Z@1 1:925d80f479bb | 603 Z@1 1:925d80f479bb |
| 603 Z@2 2:db815d6d32e6 | 604 Z@2 2:db815d6d32e6 |
| 604 * Z@3 3:9ba5f110a0b3 | 605 Z@3 3:9ba5f110a0b3 |
| 605 four 3:9ba5f110a0b3 | 606 * four 3:9ba5f110a0b3 |
| 606 should-end-on-two 2:db815d6d32e6 | 607 should-end-on-two 2:db815d6d32e6 |
| 607 $ hg bookmark Z | 608 $ hg bookmark Z |
| 608 moving bookmark 'Z' forward from f7b1eb17ad24 | 609 moving bookmark 'Z' forward from f7b1eb17ad24 |
| 609 $ hg book | 610 $ hg book |
| 610 * Z 3:9ba5f110a0b3 | 611 * Z 3:9ba5f110a0b3 |
| 618 $ hg book foo@1 -r 0 | 619 $ hg book foo@1 -r 0 |
| 619 $ hg book foo@2 -r 2 | 620 $ hg book foo@2 -r 2 |
| 620 $ hg book foo@3 -r 3 | 621 $ hg book foo@3 -r 3 |
| 621 $ hg book foo -r foo@3 | 622 $ hg book foo -r foo@3 |
| 622 $ hg book | 623 $ hg book |
| 623 Z 3:9ba5f110a0b3 | 624 * Z 3:9ba5f110a0b3 |
| 624 Z@1 1:925d80f479bb | 625 Z@1 1:925d80f479bb |
| 625 * foo 3:9ba5f110a0b3 | 626 foo 3:9ba5f110a0b3 |
| 626 foo@1 0:f7b1eb17ad24 | 627 foo@1 0:f7b1eb17ad24 |
| 627 foo@2 2:db815d6d32e6 | 628 foo@2 2:db815d6d32e6 |
| 628 four 3:9ba5f110a0b3 | 629 four 3:9ba5f110a0b3 |
| 629 should-end-on-two 2:db815d6d32e6 | 630 should-end-on-two 2:db815d6d32e6 |