Mercurial > hg

comparison tests/test-rebase-parameters.t @ 15267:3bfdfefea2fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: use revset as soon as possible in internal logic The buildstate function now take a set of revs. Logic related to --source and --base option have been moved in the main rebase function. In the process this fixes a bug where the wrong source changeset might be pick. This explain the changes in hgext/rebase.py
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sat, 15 Oct 2011 19:07:51 +0200
parents 81f76098211e
children 6cb6064f1d50
comparison
equal deleted inserted replaced
15266:8bea39ca9acb 15267:3bfdfefea2fc
49 49
50 $ hg clone -q -u . a a1 50 $ hg clone -q -u . a a1
51 $ cd a1 51 $ cd a1
52 52
53 $ hg rebase -s 8 -d 7 53 $ hg rebase -s 8 -d 7
54 abort: source is a child of destination 54 nothing to rebase
55 [255] 55 [1]
56 56
57 $ hg rebase --continue --abort 57 $ hg rebase --continue --abort
58 abort: cannot use both abort and continue 58 abort: cannot use both abort and continue
59 [255] 59 [255]
60 60
74 nothing to rebase 74 nothing to rebase
75 [1] 75 [1]
76 76
77 $ hg up -q 7 77 $ hg up -q 7
78 78
79 $ hg rebase 79 $ hg rebase --traceback
80 nothing to rebase 80 nothing to rebase
81 [1] 81 [1]
82 82
83 83
84 These work: 84 These work: