Mercurial > hg

comparison tests/test-rebase-cache.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 2fb0504b8175
comparison
equal deleted inserted replaced
23516:328afbad6e57 23517:4f18e80d9c30
103 4: 'C' branch2 103 4: 'C' branch2
104 2: 'B' branch1 104 2: 'B' branch1
105 0: 'A' 105 0: 'A'
106 106
107 $ hg rebase -s 5 -d 8 107 $ hg rebase -s 5 -d 8
108 rebasing 5:635859577d0b "D"
109 rebasing 6:5097051d331d "E"
108 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-backup.hg (glob) 110 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-backup.hg (glob)
109 111
110 $ hg branches 112 $ hg branches
111 branch3 8:466cdfb14b62 113 branch3 8:466cdfb14b62
112 branch2 4:e4fdb121d036 114 branch2 4:e4fdb121d036
164 | o 1: 'branch1' branch1 166 | o 1: 'branch1' branch1
165 |/ 167 |/
166 o 0: 'A' 168 o 0: 'A'
167 169
168 $ hg rebase -s 8 -d 6 170 $ hg rebase -s 8 -d 6
171 rebasing 8:4666b71e8e32 "F" (tip)
169 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-backup.hg (glob) 172 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-backup.hg (glob)
170 173
171 $ hg branches 174 $ hg branches
172 branch2 8:6b4bdc1b5ac0 175 branch2 8:6b4bdc1b5ac0
173 branch3 7:653b9feb4616 176 branch3 7:653b9feb4616
228 | o 1: 'branch1' branch1 231 | o 1: 'branch1' branch1
229 |/ 232 |/
230 o 0: 'A' 233 o 0: 'A'
231 234
232 $ hg rebase -s 7 -d 6 235 $ hg rebase -s 7 -d 6
236 rebasing 7:653b9feb4616 "branch3"
237 rebasing 8:4666b71e8e32 "F" (tip)
233 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-backup.hg (glob) 238 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-backup.hg (glob)
234 239
235 $ hg branches 240 $ hg branches
236 branch2 7:6b4bdc1b5ac0 241 branch2 7:6b4bdc1b5ac0
237 branch1 2:0a03079c47fd (inactive) 242 branch1 2:0a03079c47fd (inactive)
473 $ cat > $TESTTMP/checkeditform.sh <<EOF 478 $ cat > $TESTTMP/checkeditform.sh <<EOF
474 > env | grep HGEDITFORM 479 > env | grep HGEDITFORM
475 > true 480 > true
476 > EOF 481 > EOF
477 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e 482 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e
483 rebasing 5:361a99976cc9 "F"
478 HGEDITFORM=rebase.merge 484 HGEDITFORM=rebase.merge
485 rebasing 8:326cfedc031c "I" (tip)
479 HGEDITFORM=rebase.normal 486 HGEDITFORM=rebase.normal
480 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-backup.hg (glob) 487 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-backup.hg (glob)