Commits

Pierre-Yves David  committed c4abb02

remove all notion of --detach in the test

Mercurial 2.3 killed --detach (dance)

  • Participants
  • Parent commits 415540d

Comments (0)

Files changed (3)

File docs/tutorials/tutorial.t

 
 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
   $ 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.

File tests/test-obsolete-rebase.t

   (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
   |
   $ 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
   |

File tests/test-tutorial.t

 
 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
 
 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.