Mercurial > hg

comparison tests/test-rebase-cache.t @ 23518:2fb0504b8175

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: show warning when rebase creates no changes to commit Similar to graft: note: rebase of 6:eea13746799a created no changes to commit
author Mads Kiilerich <madski@unity3d.com>
date Wed, 10 Dec 2014 06:20:35 +0100
parents 4f18e80d9c30
children aa4a1672583e
comparison
equal deleted inserted replaced
23517:4f18e80d9c30 23518:2fb0504b8175
232 |/ 232 |/
233 o 0: 'A' 233 o 0: 'A'
234 234
235 $ hg rebase -s 7 -d 6 235 $ hg rebase -s 7 -d 6
236 rebasing 7:653b9feb4616 "branch3" 236 rebasing 7:653b9feb4616 "branch3"
237 note: rebase of 7:653b9feb4616 created no changes to commit
237 rebasing 8:4666b71e8e32 "F" (tip) 238 rebasing 8:4666b71e8e32 "F" (tip)
238 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-backup.hg (glob) 239 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-backup.hg (glob)
239 240
240 $ hg branches 241 $ hg branches
241 branch2 7:6b4bdc1b5ac0 242 branch2 7:6b4bdc1b5ac0