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

annotate tests/test-rebase-parameters.t @ 19925:9c78ed396075

rebase: preserve working directory parent (BC) Prior to this changeset, rebase always left the working directory as a parent of the last rebased changeset. The is dubious when, before the rebase, the working directory was not a parent of the tip most rebased changeset. With this changeset, we move the working directory back to its original parent. If the original parent was rebased, we use it's successors. This is a step toward solving issue3813 (rebase loses active bookmark if it's not on a head)

author	Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date	Mon, 14 Oct 2013 16:12:29 +0200
parents	0250047a365e
children	aa9385f983fa

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 >
15742 65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15270 diff changeset	6 > [phases]
65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15270 diff changeset	7 > publish=False
65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15270 diff changeset	8 >
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	9 > [alias]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	10 > tglog = log -G --template "{rev}: '{desc}' {branches}\n"
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	11 > EOF
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	12
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	13
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	14 $ hg init a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	15 $ cd a
16350 4f795f5fbb0b tests: make tests work if directory contains special characters Thomas Arendsen Hein <thomas@intevation.de> parents: 15742 diff changeset	16 $ hg unbundle "$TESTDIR/bundles/rebase.hg"
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	17 adding changesets
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	18 adding manifests
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	19 adding file changes
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	20 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	21 (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	22 $ hg up tip
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	23 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	24
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	25 $ echo I > I
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	26 $ hg ci -AmI
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	27 adding I
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	28
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	29 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	30 @ 8: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	31 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	32 o 7: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	33 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	34 \| o 6: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	35 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	36 o \| 5: 'F'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	37 \| \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	38 \| o 4: 'E'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	39 \|/
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	40 \| o 3: 'D'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	41 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	42 \| o 2: 'C'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	43 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	44 \| o 1: 'B'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	45 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	46 o 0: 'A'
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 $ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	49
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	50
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	51 These fail:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	52
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	53 $ hg clone -q -u . a a1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	54 $ cd a1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	55
14123 7d1b637738a3 tests: move testcase from rebase-named-branches to rebase-parameters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14122 diff changeset	56 $ hg rebase -s 8 -d 7
15267 3bfdfefea2fc rebase: use revset as soon as possible in internal logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15132 diff changeset	57 nothing to rebase
3bfdfefea2fc rebase: use revset as soon as possible in internal logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15132 diff changeset	58 [1]
14123 7d1b637738a3 tests: move testcase from rebase-named-branches to rebase-parameters Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 14122 diff changeset	59
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	60 $ hg rebase --continue --abort
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	61 abort: cannot use both abort and continue
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	62 [255]
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	63
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	64 $ hg rebase --continue --collapse
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	65 abort: cannot use collapse with continue or abort
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	66 [255]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	67
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	68 $ hg rebase --continue --dest 4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	69 abort: abort and continue do not allow specifying revisions
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	70 [255]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	71
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	72 $ hg rebase --base 5 --source 4
15270 6cb6064f1d50 rebase: add --rev option to rebase Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15267 diff changeset	73 abort: cannot specify both a source and a base
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	74 [255]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	75
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	76 $ hg rebase --rev 5 --source 4
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	77 abort: cannot specify both a revision and a source
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	78 [255]
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	79 $ hg rebase --base 5 --rev 4
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	80 abort: cannot specify both a revision and a base
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	81 [255]
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	82
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	83 $ hg rebase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	84 nothing to rebase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	85 [1]
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	86
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	87 $ hg up -q 7
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	88
15267 3bfdfefea2fc rebase: use revset as soon as possible in internal logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15132 diff changeset	89 $ hg rebase --traceback
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	90 nothing to rebase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	91 [1]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	92
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	93
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	94 These work:
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 Rebase with no arguments (from 3 onto 8):
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 $ hg up -q -C 3
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	99
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	100 $ hg rebase
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	101 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	102
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	103 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	104 @ 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	105 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	106 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	107 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	108 o 6: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	109 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	110 o 5: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	111 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	112 o 4: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	113 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	114 \| o 3: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	115 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	116 o \| 2: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	117 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	118 \| o 1: 'E'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	119 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	120 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	121
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	122 Try to rollback after a rebase (fail):
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	123
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	124 $ hg rollback
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	125 no rollback information available
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	126 [1]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	127
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	128 $ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	129
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	130
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	131 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	132
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	133 $ hg clone -q -u 3 a a2
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	134 $ cd a2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	135
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	136 $ hg rebase --base .
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	137 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	138
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	139 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	140 @ 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	141 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	142 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	143 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	144 o 6: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	145 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	146 o 5: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	147 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	148 o 4: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	149 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	150 \| o 3: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	151 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	152 o \| 2: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	153 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	154 \| o 1: 'E'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	155 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	156 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	157
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	158 $ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	159
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	160
16566 ae6dddffe4f1 rebase: make --dest understand revsets Patrick Mezard <patrick@mezard.eu> parents: 16550 diff changeset	161 Rebase with dest == branch(.) => same as no arguments (from 3 onto 8):
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	162
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	163 $ hg clone -q -u 3 a a3
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	164 $ cd a3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	165
16566 ae6dddffe4f1 rebase: make --dest understand revsets Patrick Mezard <patrick@mezard.eu> parents: 16550 diff changeset	166 $ hg rebase --dest 'branch(.)'
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	167 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	168
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	169 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	170 @ 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	171 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	172 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	173 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	174 o 6: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	175 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	176 o 5: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	177 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	178 o 4: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	179 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	180 \| o 3: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	181 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	182 o \| 2: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	183 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	184 \| o 1: 'E'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	185 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	186 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	187
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	188 $ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	189
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	190
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	191 Specify only source (from 2 onto 8):
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	192
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	193 $ hg clone -q -u . a a4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	194 $ cd a4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	195
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	196 $ hg rebase --source 'desc("C")'
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	197 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	198
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	199 $ hg tglog
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19214 diff changeset	200 o 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	201 \|
17019 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	202 o 7: 'C'
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	203 \|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19214 diff changeset	204 @ 6: 'I'
17019 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	205 \|
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	206 o 5: 'H'
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	207 \|
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	208 \| o 4: 'G'
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	209 \|/\|
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	210 o \| 3: 'F'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	211 \| \|
17019 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	212 \| o 2: 'E'
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	213 \|/
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	214 \| o 1: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	215 \|/
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	216 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	217
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	218 $ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	219
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	220
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	221 Specify only dest (from 3 onto 6):
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	222
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	223 $ hg clone -q -u 3 a a5
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	224 $ cd a5
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	225
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	226 $ hg rebase --dest 6
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	227 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	228
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	229 $ hg tglog
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	230 @ 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	231 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	232 o 7: 'C'
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 6: 'B'
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 5: 'I'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	237 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	238 \| o 4: 'H'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	239 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	240 o \| 3: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	241 \|\\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	242 \| o 2: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	243 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	244 o \| 1: 'E'
12605 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 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	247
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	248 $ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	249
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	250
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	251 Specify only base (from 1 onto 8):
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	252
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	253 $ hg clone -q -u . a a6
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	254 $ cd a6
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	255
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	256 $ hg rebase --base 'desc("D")'
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	257 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	258
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	259 $ hg tglog
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19214 diff changeset	260 o 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	261 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	262 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	263 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	264 o 6: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	265 \|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19214 diff changeset	266 @ 5: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	267 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	268 o 4: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	269 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	270 \| o 3: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	271 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	272 o \| 2: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	273 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	274 \| o 1: 'E'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	275 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	276 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	277
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	278 $ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	279
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	280
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	281 Specify source and dest (from 2 onto 7):
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	282
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	283 $ hg clone -q -u . a a7
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	284 $ cd a7
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	285
17019 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	286 $ hg rebase --source 2 --dest 7
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	287 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	288
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	289 $ hg tglog
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19214 diff changeset	290 o 8: 'D'
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	291 \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	292 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	293 \|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19214 diff changeset	294 \| @ 6: 'I'
14122 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 5: 'H'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	297 \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	298 \| o 4: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	299 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	300 o \| 3: 'F'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	301 \| \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	302 \| o 2: 'E'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	303 \|/
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	304 \| o 1: 'B'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	305 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	306 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	307
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	308 $ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	309
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	310
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	311 Specify base and dest (from 1 onto 7):
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	312
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	313 $ hg clone -q -u . a a8
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	314 $ cd a8
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 $ hg rebase --base 3 --dest 7
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12605 diff changeset	317 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	318
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	319 $ hg tglog
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19214 diff changeset	320 o 8: 'D'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	321 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	322 o 7: 'C'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	323 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	324 o 6: 'B'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	325 \|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19214 diff changeset	326 \| @ 5: 'I'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	327 \|/
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	328 o 4: 'H'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	329 \|
14122 e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	330 \| o 3: 'G'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	331 \|/\|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	332 o \| 2: 'F'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	333 \| \|
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	334 \| o 1: 'E'
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	335 \|/
e83567686d66 tests: change test-rebase-parameters to use bundle/rebase.hg Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 13856 diff changeset	336 o 0: 'A'
12605 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	337
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11208 diff changeset	338 $ cd ..
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	339
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	340
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	341 Specify only revs (from 2 onto 8)
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	342
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	343 $ hg clone -q -u . a a9
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	344 $ cd a9
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	345
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	346 $ hg rebase --rev 'desc("C")::'
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	347 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/*-backup.hg (glob)
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	348
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	349 $ hg tglog
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19214 diff changeset	350 o 8: 'D'
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	351 \|
17019 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	352 o 7: 'C'
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	353 \|
19925 9c78ed396075 rebase: preserve working directory parent (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 19214 diff changeset	354 @ 6: 'I'
17019 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	355 \|
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	356 o 5: 'H'
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	357 \|
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	358 \| o 4: 'G'
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	359 \|/\|
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	360 o \| 3: 'F'
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	361 \| \|
17019 50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	362 \| o 2: 'E'
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	363 \|/
50f434510da6 rebase: do not add second parent to rebased changeset (drop detach option) (BC) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 16912 diff changeset	364 \| o 1: 'B'
16550 0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	365 \|/
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	366 o 0: 'A'
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	367
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	368 $ cd ..
0d494a38c586 test-rebase-parameters: more tests for revset/opts Patrick Mezard <patrick@mezard.eu> parents: 16350 diff changeset	369
13856 0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	370 Test --tool parameter:
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 $ hg init b
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	373 $ cd b
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 $ echo c1 > c1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	376 $ hg ci -Am c1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	377 adding c1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	378
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	379 $ echo c2 > c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	380 $ hg ci -Am c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	381 adding c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	382
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	383 $ hg up -q 0
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	384 $ echo c2b > c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	385 $ hg ci -Am c2b
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	386 adding c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	387 created new head
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	388
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	389 $ cd ..
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	390
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	391 $ 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	392 $ cd b1
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	393
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	394 $ 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	395 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	396
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	397 $ hg cat c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	398 c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	399
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	400 $ cd ..
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	401
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	402
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	403 $ 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	404 $ cd b2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	405
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	406 $ 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	407 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	408
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	409 $ hg cat c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	410 c2b
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	411
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	412 $ cd ..
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	413
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	414
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	415 $ 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	416 $ cd b3
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	417
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	418 $ hg rebase -s 2 -d 1 --tool internal:fail
18933 42b620fc89e2 rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc) Augie Fackler <raf@durin42.com> parents: 17019 diff changeset	419 unresolved conflicts (see hg resolve, then hg rebase --continue)
18935 e5d9441ec281 dispatch: exit with status 1 for an InterventionRequired exception (bc) Augie Fackler <raf@durin42.com> parents: 18933 diff changeset	420 [1]
13856 0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	421
19213 f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	422 $ hg summary
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	423 parent: 1:56daeba07f4b
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	424 c2
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	425 parent: 2:e4e3f3546619 tip
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	426 c2b
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	427 branch: default
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	428 commit: 1 modified, 1 unresolved (merge)
f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	429 update: (current)
19214 0250047a365e summary: indicate if a rebase is underway Bryan O'Sullivan <bryano@fb.com> parents: 19213 diff changeset	430 rebase: 0 rebased, 1 remaining (rebase --continue)
19213 f324a9b8d4bf summary: add tests for some extensions we plan to modify Bryan O'Sullivan <bryano@fb.com> parents: 18935 diff changeset	431
13856 0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	432 $ hg resolve -l
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	433 U c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	434
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	435 $ hg resolve -m c2
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	436 $ 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	437 tool option will be ignored
0995eee8ffe4 rebase: add --tool argument for specifying merge tool Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12640 diff changeset	438 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	439
16912 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16566 diff changeset	440 $ cd ..

Mercurial > hg > mercurial-crew

annotate tests/test-rebase-parameters.t @ 19925:9c78ed396075