mercurial-crew: tests/test-rebase-parameters.t annotate

annotate tests/test-rebase-parameters.t @ 15132:81f76098211e

rebase: allow rebase to ancestor (issue3010) We only deny rebasing onto direct parent. Thanks to the ancestor argument of merge. the "implementation" of this feature only consist in loosing the check and imply detach when rebasing on ancestor.

author	Pierre-Yves David <pierre-yves.david@logilab.fr>
date	Mon, 19 Sep 2011 16:57:13 +0200
parents	7d1b637738a3
children	3bfdfefea2fc

rev	line source
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	1 $ cat >> $HGRCPATH <<EOF
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	2 > [extensions]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	3 > graphlog=
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	4 > rebase=
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	5 >
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	6 > [alias]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	7 > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	8 > EOF
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	9
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	10
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	11 $ hg init a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	12 $ cd a
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	13 $ hg unbundle $TESTDIR/bundles/rebase.hg
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	14 adding changesets
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	15 adding manifests
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	16 adding file changes
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	17 added 8 changesets with 7 changes to 7 files (+2 heads)
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	18 (run 'hg heads' to see heads, 'hg merge' to merge)
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	19 $ hg up tip
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	20 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	21
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	22 $ echo I > I
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	23 $ hg ci -AmI
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	24 adding I
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	25
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	26 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	27 @ 8: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	28 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	29 o 7: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	30 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	31 \| o 6: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	32 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	33 o \| 5: 'F'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	34 \| \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	35 \| o 4: 'E'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	36 \|/
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	37 \| o 3: 'D'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	38 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	39 \| o 2: 'C'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	40 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	41 \| o 1: 'B'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	42 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	43 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	44
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	45 $ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	46
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	47
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	48 These fail:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	49
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	50 $ hg clone -q -u . a a1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	51 $ cd a1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	52
14123 7d1b637738a3 tests: move testcase from rebase-named-branches to rebase-parameters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14122 diff changeset	53 $ hg rebase -s 8 -d 7
15132 81f76098211e rebase: allow rebase to ancestor (issue3010) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14123 diff changeset	54 abort: source is a child of destination
14123 7d1b637738a3 tests: move testcase from rebase-named-branches to rebase-parameters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14122 diff changeset	55 [255]
7d1b637738a3 tests: move testcase from rebase-named-branches to rebase-parameters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14122 diff changeset	56
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	57 $ hg rebase --continue --abort
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	58 abort: cannot use both abort and continue
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	59 [255]
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	60
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	61 $ hg rebase --continue --collapse
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	62 abort: cannot use collapse with continue or abort
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	63 [255]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	64
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	65 $ hg rebase --continue --dest 4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	66 abort: abort and continue do not allow specifying revisions
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	67 [255]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	68
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	69 $ hg rebase --base 5 --source 4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	70 abort: cannot specify both a revision and a base
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	71 [255]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	72
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	73 $ hg rebase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	74 nothing to rebase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	75 [1]
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	76
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	77 $ hg up -q 7
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	78
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	79 $ hg rebase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	80 nothing to rebase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	81 [1]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	82
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	83
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	84 These work:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	85
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	86 Rebase with no arguments (from 3 onto 8):
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	87
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	88 $ hg up -q -C 3
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	89
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	90 $ hg rebase
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	91 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	92
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	93 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	94 @ 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	95 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	96 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	97 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	98 o 6: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	99 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	100 o 5: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	101 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	102 o 4: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	103 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	104 \| o 3: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	105 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	106 o \| 2: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	107 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	108 \| o 1: 'E'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	109 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	110 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	111
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	112 Try to rollback after a rebase (fail):
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	113
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	114 $ hg rollback
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	115 no rollback information available
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	116 [1]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	117
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	118 $ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	119
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	120
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	121 Rebase with base == '.' => same as no arguments (from 3 onto 8):
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	122
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	123 $ hg clone -q -u 3 a a2
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	124 $ cd a2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	125
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	126 $ hg rebase --base .
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	127 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	128
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	129 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	130 @ 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	131 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	132 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	133 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	134 o 6: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	135 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	136 o 5: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	137 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	138 o 4: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	139 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	140 \| o 3: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	141 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	142 o \| 2: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	143 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	144 \| o 1: 'E'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	145 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	146 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	147
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	148 $ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	149
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	150
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	151 Rebase with dest == `hg branch` => same as no arguments (from 3 onto 8):
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	152
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	153 $ hg clone -q -u 3 a a3
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	154 $ cd a3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	155
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	156 $ hg rebase --dest `hg branch`
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	157 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	158
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	159 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	160 @ 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	161 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	162 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	163 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	164 o 6: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	165 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	166 o 5: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	167 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	168 o 4: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	169 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	170 \| o 3: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	171 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	172 o \| 2: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	173 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	174 \| o 1: 'E'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	175 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	176 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	177
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	178 $ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	179
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	180
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	181 Specify only source (from 2 onto 8):
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	182
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	183 $ hg clone -q -u . a a4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	184 $ cd a4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	185
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	186 $ hg rebase --source 2
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	187 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	188
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	189 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	190 @ 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	191 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	192 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	193 \|\
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	194 \| o 6: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	195 \| \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	196 \| o 5: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	197 \| \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	198 \| \| o 4: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	199 \| \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	200 \| o \| 3: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	201 \| \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	202 \| \| o 2: 'E'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	203 \| \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	204 o \| 1: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	205 \|/
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	206 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	207
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	208 $ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	209
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	210
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	211 Specify only dest (from 3 onto 6):
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	212
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	213 $ hg clone -q -u 3 a a5
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	214 $ cd a5
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	215
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	216 $ hg rebase --dest 6
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	217 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
7130 204c7850c158 rebase: disable rollback after rebasing Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6939 diff changeset	218
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	219 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	220 @ 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	221 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	222 o 7: 'C'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	223 \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	224 o 6: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	225 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	226 \| o 5: 'I'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	227 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	228 \| o 4: 'H'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	229 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	230 o \| 3: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	231 \|\\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	232 \| o 2: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	233 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	234 o \| 1: 'E'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	235 \|/
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	236 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	237
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	238 $ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	239
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	240
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	241 Specify only base (from 1 onto 8):
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	242
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	243 $ hg clone -q -u . a a6
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	244 $ cd a6
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	245
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	246 $ hg rebase --base 3
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	247 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	248
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	249 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	250 @ 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	251 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	252 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	253 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	254 o 6: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	255 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	256 o 5: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	257 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	258 o 4: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	259 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	260 \| o 3: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	261 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	262 o \| 2: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	263 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	264 \| o 1: 'E'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	265 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	266 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	267
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	268 $ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	269
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	270
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	271 Specify source and dest (from 2 onto 7):
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	272
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	273 $ hg clone -q -u . a a7
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	274 $ cd a7
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	275
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	276 $ hg rebase --detach --source 2 --dest 7
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	277 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	278
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	279 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	280 @ 8: 'D'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	281 \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	282 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	283 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	284 \| o 6: 'I'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	285 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	286 o 5: 'H'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	287 \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	288 \| o 4: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	289 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	290 o \| 3: 'F'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	291 \| \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	292 \| o 2: 'E'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	293 \|/
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	294 \| o 1: 'B'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	295 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	296 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	297
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	298 $ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	299
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	300
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	301 Specify base and dest (from 1 onto 7):
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	302
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	303 $ hg clone -q -u . a a8
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	304 $ cd a8
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	305
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	306 $ hg rebase --base 3 --dest 7
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	307 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	308
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	309 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	310 @ 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	311 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	312 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	313 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	314 o 6: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	315 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	316 \| o 5: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	317 \|/
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	318 o 4: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	319 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	320 \| o 3: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	321 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	322 o \| 2: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	323 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	324 \| o 1: 'E'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	325 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	326 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	327
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	328 $ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	329
13856 0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	330 Test --tool parameter:
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	331
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	332 $ hg init b
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	333 $ cd b
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	334
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	335 $ echo c1 > c1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	336 $ hg ci -Am c1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	337 adding c1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	338
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	339 $ echo c2 > c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	340 $ hg ci -Am c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	341 adding c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	342
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	343 $ hg up -q 0
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	344 $ echo c2b > c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	345 $ hg ci -Am c2b
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	346 adding c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	347 created new head
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	348
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	349 $ cd ..
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	350
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	351 $ hg clone -q -u . b b1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	352 $ cd b1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	353
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	354 $ hg rebase -s 2 -d 1 --tool internal:local
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	355 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/*-backup.hg (glob)
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	356
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	357 $ hg cat c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	358 c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	359
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	360 $ cd ..
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	361
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	362
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	363 $ hg clone -q -u . b b2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	364 $ cd b2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	365
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	366 $ hg rebase -s 2 -d 1 --tool internal:other
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	367 saved backup bundle to $TESTTMP/b2/.hg/strip-backup/*-backup.hg (glob)
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	368
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	369 $ hg cat c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	370 c2b
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	371
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	372 $ cd ..
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	373
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	374
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	375 $ hg clone -q -u . b b3
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	376 $ cd b3
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	377
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	378 $ hg rebase -s 2 -d 1 --tool internal:fail
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	379 abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	380 [255]
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	381
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	382 $ hg resolve -l
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	383 U c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	384
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	385 $ hg resolve -m c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	386 $ hg rebase -c --tool internal:fail
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	387 tool option will be ignored
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	388 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob)
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	389

Mercurial > hg > mercurial-crew

annotate tests/test-rebase-parameters.t @ 15132:81f76098211e