Mercurial > hg > evolve
changeset 547:c4abb0218e84 stable
remove all notion of --detach in the test
Mercurial 2.3 killed --detach (dance)
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Mon, 10 Sep 2012 16:54:58 +0200 |
| parents | 415540dee2bd |
| children | bebc6753e7b9 |
| files | docs/tutorials/tutorial.t tests/test-obsolete-rebase.t tests/test-tutorial.t |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/tutorials/tutorial.t +++ b/docs/tutorials/tutorial.t @@ -400,7 +400,7 @@ for simplicity shake we get the bathroom change in line again - $ hg rebase -Dr 8d39a843582d -d a2fccc2e7b08 + $ hg rebase -r 8d39a843582d -d a2fccc2e7b08 merging shopping $ hg phase --draft . $ hg log -G @@ -624,11 +624,11 @@ $ hg stabilize --dry-run move:[15] animals atop:[14] bathroom stuff - hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818 + hg rebase -r 9ac5d0e790a2 -d ffa278c50818 Let's do it - $ hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818 + $ hg rebase -r 9ac5d0e790a2 -d ffa278c50818 merging shopping The old version of bathroom is hidden again.
--- a/tests/test-obsolete-rebase.t +++ b/tests/test-obsolete-rebase.t @@ -39,7 +39,7 @@ (see hg help phases for details) [255] $ hg phase --draft --force 0 - $ hg rebase -d 1 -r 3 --detach --keep + $ hg rebase -d 1 -r 3 --keep $ glog @ 4:9c5494949763@default(draft) adde | @@ -66,7 +66,7 @@ $ hg --config extensions.hgext.mq= strip tip 0 files updated, 0 files merged, 1 files removed, 0 files unresolved saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9c5494949763-backup.hg - $ hg rebase -d 1 -r 3 --detach + $ hg rebase -d 1 -r 3 $ glog @ 4:9c5494949763@default(draft) adde |
--- a/tests/test-tutorial.t +++ b/tests/test-tutorial.t @@ -403,7 +403,7 @@ for simplicity shake we get the bathroom change in line again - $ hg rebase -Dr 8d39a843582d -d a2fccc2e7b08 + $ hg rebase -r 8d39a843582d -d a2fccc2e7b08 merging shopping $ hg phase --draft . $ hg log -G @@ -631,7 +631,7 @@ Let's do it - $ hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818 + $ hg rebase -r 9ac5d0e790a2 -d ffa278c50818 merging shopping The old version of bathroom is hidden again.