Mercurial > hg

comparison tests/test-rebase-issue-noparam-single-rev.t @ 23517:4f18e80d9c30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: show more useful status information while rebasing Show status messages while rebasing, similar to what graft do: rebasing 12:2647734878ef "fork" (tip) This gives more context for the user when resolving conflicts.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 09 Dec 2014 03:45:26 +0100
parents 328afbad6e57
children aa4a1672583e
comparison
equal deleted inserted replaced
23516:328afbad6e57 23517:4f18e80d9c30
50 Rebase with no arguments - single revision in source branch: 50 Rebase with no arguments - single revision in source branch:
51 51
52 $ hg up -q -C 2 52 $ hg up -q -C 2
53 53
54 $ hg rebase 54 $ hg rebase
55 rebasing 2:87c180a611f2 "l1"
55 saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-backup.hg (glob) 56 saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-backup.hg (glob)
56 57
57 $ hg tglog 58 $ hg tglog
58 @ 4: 'l1' 59 @ 4: 'l1'
59 | 60 |
108 Rebase with no arguments - single revision in target branch: 109 Rebase with no arguments - single revision in target branch:
109 110
110 $ hg up -q -C 3 111 $ hg up -q -C 3
111 112
112 $ hg rebase 113 $ hg rebase
114 rebasing 2:87c180a611f2 "l1"
115 rebasing 3:1ac923b736ef "l2"
113 saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-backup.hg (glob) 116 saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-backup.hg (glob)
114 117
115 $ hg tglog 118 $ hg tglog
116 @ 4: 'l2' 119 @ 4: 'l2'
117 | 120 |