Mercurial > hg
comparison tests/test-bookmarks.t @ 26286:4b685712fa45
bookmark: do not crash when active bookmark is forward and --date is used
The logic that decides where to update according to the active bookmark
location (when not on ".") was setting the rev to update to before we process
--date. This lead to --date processing aborting because of duplicated
specification.
We reorder the two pieces of code and add a test for this.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 17 Sep 2015 16:08:10 -0700 |
| parents | 91cad8eb7951 |
| children | 5c9ec1cc671a |
comparison
equal
deleted
inserted
replaced
| 26285:91cad8eb7951 | 26286:4b685712fa45 |
|---|---|
| 584 adding file changes | 584 adding file changes |
| 585 added 2 changesets with 2 changes to 2 files (+1 heads) | 585 added 2 changesets with 2 changes to 2 files (+1 heads) |
| 586 updating bookmark Y | 586 updating bookmark Y |
| 587 updating bookmark Z | 587 updating bookmark Z |
| 588 (run 'hg heads' to see heads, 'hg merge' to merge) | 588 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 589 | |
| 590 (# tests strange but with --date crashing when bookmark have to move) | |
| 591 | |
| 592 $ hg -R ../cloned-bookmarks-manual-update update -d 1986 | |
| 593 abort: revision matching date not found | |
| 594 [255] | |
| 589 $ hg -R ../cloned-bookmarks-manual-update update | 595 $ hg -R ../cloned-bookmarks-manual-update update |
| 590 updating to active bookmark Y | 596 updating to active bookmark Y |
| 591 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 597 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 592 (activating bookmark Y) | 598 (activating bookmark Y) |
| 593 | 599 |