Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rebase-parameters.t
changeset 23517 4f18e80d9c30
parent 23516 328afbad6e57
child 23518 2fb0504b8175 
--- a/tests/test-rebase-parameters.t	Sun Dec 07 20:04:45 2014 +0100
+++ b/tests/test-rebase-parameters.t	Tue Dec 09 03:45:26 2014 +0100
@@ -120,6 +120,9 @@
   $ hg up -q -C 3
 
   $ hg rebase
+  rebasing 1:42ccdea3bb16 "B"
+  rebasing 2:5fddd98957c8 "C"
+  rebasing 3:32af7686d403 "D"
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
 
   $ hg tglog
@@ -155,6 +158,9 @@
   $ cd a2
 
   $ hg rebase --base .
+  rebasing 1:42ccdea3bb16 "B"
+  rebasing 2:5fddd98957c8 "C"
+  rebasing 3:32af7686d403 "D"
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
 
   $ hg tglog
@@ -185,6 +191,9 @@
   $ cd a3
 
   $ hg rebase --dest 'branch(.)'
+  rebasing 1:42ccdea3bb16 "B"
+  rebasing 2:5fddd98957c8 "C"
+  rebasing 3:32af7686d403 "D"
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
 
   $ hg tglog
@@ -215,6 +224,8 @@
   $ cd a4
 
   $ hg rebase --source 'desc("C")'
+  rebasing 2:5fddd98957c8 "C"
+  rebasing 3:32af7686d403 "D"
   saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
 
   $ hg tglog
@@ -245,6 +256,9 @@
   $ cd a5
 
   $ hg rebase --dest 6
+  rebasing 1:42ccdea3bb16 "B"
+  rebasing 2:5fddd98957c8 "C"
+  rebasing 3:32af7686d403 "D"
   saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
 
   $ hg tglog
@@ -275,6 +289,9 @@
   $ cd a6
 
   $ hg rebase --base 'desc("D")'
+  rebasing 1:42ccdea3bb16 "B"
+  rebasing 2:5fddd98957c8 "C"
+  rebasing 3:32af7686d403 "D"
   saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
 
   $ hg tglog
@@ -305,6 +322,8 @@
   $ cd a7
 
   $ hg rebase --source 2 --dest 7
+  rebasing 2:5fddd98957c8 "C"
+  rebasing 3:32af7686d403 "D"
   saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
 
   $ hg tglog
@@ -335,6 +354,9 @@
   $ cd a8
 
   $ hg rebase --base 3 --dest 7
+  rebasing 1:42ccdea3bb16 "B"
+  rebasing 2:5fddd98957c8 "C"
+  rebasing 3:32af7686d403 "D"
   saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
 
   $ hg tglog
@@ -365,6 +387,8 @@
   $ cd a9
 
   $ hg rebase --rev 'desc("C")::'
+  rebasing 2:5fddd98957c8 "C"
+  rebasing 3:32af7686d403 "D"
   saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
 
   $ hg tglog
@@ -413,6 +437,7 @@
   $ cd b1
 
   $ hg rebase -s 2 -d 1 --tool internal:local
+  rebasing 2:e4e3f3546619 "c2b" (tip)
   saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-backup.hg (glob)
 
   $ hg cat c2
@@ -425,6 +450,7 @@
   $ cd b2
 
   $ hg rebase -s 2 -d 1 --tool internal:other
+  rebasing 2:e4e3f3546619 "c2b" (tip)
   saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-backup.hg (glob)
 
   $ hg cat c2
@@ -437,6 +463,7 @@
   $ cd b3
 
   $ hg rebase -s 2 -d 1 --tool internal:fail
+  rebasing 2:e4e3f3546619 "c2b" (tip)
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
@@ -457,6 +484,7 @@
   (no more unresolved files)
   $ hg rebase -c --tool internal:fail
   tool option will be ignored
+  rebasing 2:e4e3f3546619 "c2b" (tip)
   saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-backup.hg (glob)
 
   $ hg rebase -i
Mercurial