mercurial-scm/hg: tests/test-rebase-parameters.out annotate

annotate tests/test-rebase-parameters.out @ 11109:a2bc2f2d77a9

subrepo: normalize path part of URLs so that pulling subrepos from webdir works For a "all projects at root" repo layout eg: /main /sub Where subrepos are used such that a clone of main has this layout: ./main/ ./main/.hgsub ./main/sub/ And the .hgsub content is: sub = ../sub This allows a pull from a hgweb where main and sub are exposed at the root (or same directory level) The current code doesn't normalize the path component of a pull url. this results in trying to pull from http://server.com/hg/main/../sub Current hgweb implementation doesn't reduce the path component so this results in a 404 error though everything is setup logically. This patch adresses this 404 error on the puller side normalizing the URLs used for pulling sub repos. For this example, the URL would be reduced to http://server.com/hg/sub Fix + test

author	Edouard Gomez <ed.gomez@free.fr>
date	Sat, 01 May 2010 23:05:19 +0200
parents	23ab3b05bd66
children	b5c0f6a11430

rev	line source
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1 % These fail
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	2
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	3 % Use continue and abort
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	4 hg rebase: cannot use both abort and continue
10636 23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	5 hg rebase [-s REV \| -b REV] [-d REV] [options]
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	6 hg rebase {-a\|-c}
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	7
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	8 move changeset (and descendants) to a different branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	9
9073 ec1cd3176625 rebase: wrapped docstrings at 78 characters Martin Geisler <mg@lazybytes.net> parents: 8076 diff changeset	10 Rebase uses repeated merging to graft changesets from one part of history
10636 23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	11 (the source) onto another (the destination). This can be useful for
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	12 linearizing local changes relative to a master development tree.
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	13
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	14 If you don't specify a destination changeset ("-d/--dest"), rebase uses
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	15 the tipmost head of the current named branch as the destination. (The
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	16 destination changeset is not modified by rebasing, but new changesets are
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	17 added as its descendants.)
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	18
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	19 You can specify which changesets to rebase in two ways: as a "source"
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	20 changeset or as a "base" changeset. Both are shorthand for a topologically
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	21 related set of changesets (the "source branch"). If you specify source
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	22 ("-s/--source"), rebase will rebase that changeset and all of its
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	23 descendants onto dest. If you specify base ("-b/--base"), rebase will
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	24 select ancestors of base back to but not including the common ancestor
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	25 with dest. Thus, "-b" is less precise but more convenient than "-s": you
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	26 can specify any changeset in the source branch, and rebase will select the
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	27 whole branch. If you specify neither "-s" nor "-b", rebase uses the parent
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	28 of the working directory as the base.
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	29
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	30 By default, rebase recreates the changesets in the source branch as
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	31 descendants of dest and then destroys the originals. Use "--keep" to
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	32 preserve the original source changesets. Some changesets in the source
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	33 branch (e.g. merges from the destination branch) may be dropped if they no
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	34 longer contribute any change.
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	35
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	36 One result of the rules for selecting the destination changeset and source
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	37 branch is that, unlike "merge", rebase will do nothing if you are at the
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	38 latest (tipmost) head of a named branch with two heads. You need to
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	39 explicitly specify source and/or destination (or "update" to the other
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	40 head, if it's the head of the intended source branch).
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	41
7999 b25110140573 rebase: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7951 diff changeset	42 If a rebase is interrupted to manually resolve a merge, it can be
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8031 diff changeset	43 continued with --continue/-c or aborted with --abort/-a.
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	44
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	45 options:
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	46
10636 23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	47 -s --source rebase from the specified changeset
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	48 -b --base rebase from the base of the specified changeset (up to
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	49 greatest common ancestor of base and dest)
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	50 -d --dest rebase onto the specified changeset
9589 fdf0c375cdbf rebase: change rebase help to talk about changesets and branch names timeless@mozdev.org parents: 8076 diff changeset	51 --collapse collapse the rebased changesets
fdf0c375cdbf rebase: change rebase help to talk about changesets and branch names timeless@mozdev.org parents: 8076 diff changeset	52 --keep keep original changesets
fdf0c375cdbf rebase: change rebase help to talk about changesets and branch names timeless@mozdev.org parents: 8076 diff changeset	53 --keepbranches keep original branch names
10352 66d954e76ffb rebase: add --detach option to detach intermediate revisions (issue1950) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 9599 diff changeset	54 --detach force detaching of source from its original branch
7468 3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	55 -c --continue continue an interrupted rebase
3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	56 -a --abort abort an interrupted rebase
3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	57 --style display using template map file
3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	58 --template display with template
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	59
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	60 use "hg -v help rebase" to show global options
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	61
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	62 % Use continue and collapse
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	63 hg rebase: cannot use collapse with continue or abort
10636 23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	64 hg rebase [-s REV \| -b REV] [-d REV] [options]
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	65 hg rebase {-a\|-c}
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	66
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	67 move changeset (and descendants) to a different branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	68
9073 ec1cd3176625 rebase: wrapped docstrings at 78 characters Martin Geisler <mg@lazybytes.net> parents: 8076 diff changeset	69 Rebase uses repeated merging to graft changesets from one part of history
10636 23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	70 (the source) onto another (the destination). This can be useful for
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	71 linearizing local changes relative to a master development tree.
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	72
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	73 If you don't specify a destination changeset ("-d/--dest"), rebase uses
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	74 the tipmost head of the current named branch as the destination. (The
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	75 destination changeset is not modified by rebasing, but new changesets are
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	76 added as its descendants.)
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	77
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	78 You can specify which changesets to rebase in two ways: as a "source"
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	79 changeset or as a "base" changeset. Both are shorthand for a topologically
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	80 related set of changesets (the "source branch"). If you specify source
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	81 ("-s/--source"), rebase will rebase that changeset and all of its
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	82 descendants onto dest. If you specify base ("-b/--base"), rebase will
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	83 select ancestors of base back to but not including the common ancestor
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	84 with dest. Thus, "-b" is less precise but more convenient than "-s": you
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	85 can specify any changeset in the source branch, and rebase will select the
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	86 whole branch. If you specify neither "-s" nor "-b", rebase uses the parent
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	87 of the working directory as the base.
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	88
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	89 By default, rebase recreates the changesets in the source branch as
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	90 descendants of dest and then destroys the originals. Use "--keep" to
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	91 preserve the original source changesets. Some changesets in the source
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	92 branch (e.g. merges from the destination branch) may be dropped if they no
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	93 longer contribute any change.
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	94
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	95 One result of the rules for selecting the destination changeset and source
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	96 branch is that, unlike "merge", rebase will do nothing if you are at the
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	97 latest (tipmost) head of a named branch with two heads. You need to
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	98 explicitly specify source and/or destination (or "update" to the other
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	99 head, if it's the head of the intended source branch).
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	100
7999 b25110140573 rebase: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7951 diff changeset	101 If a rebase is interrupted to manually resolve a merge, it can be
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8031 diff changeset	102 continued with --continue/-c or aborted with --abort/-a.
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	103
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	104 options:
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	105
10636 23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	106 -s --source rebase from the specified changeset
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	107 -b --base rebase from the base of the specified changeset (up to
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	108 greatest common ancestor of base and dest)
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	109 -d --dest rebase onto the specified changeset
9589 fdf0c375cdbf rebase: change rebase help to talk about changesets and branch names timeless@mozdev.org parents: 8076 diff changeset	110 --collapse collapse the rebased changesets
fdf0c375cdbf rebase: change rebase help to talk about changesets and branch names timeless@mozdev.org parents: 8076 diff changeset	111 --keep keep original changesets
fdf0c375cdbf rebase: change rebase help to talk about changesets and branch names timeless@mozdev.org parents: 8076 diff changeset	112 --keepbranches keep original branch names
10352 66d954e76ffb rebase: add --detach option to detach intermediate revisions (issue1950) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 9599 diff changeset	113 --detach force detaching of source from its original branch
7468 3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	114 -c --continue continue an interrupted rebase
3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	115 -a --abort abort an interrupted rebase
3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	116 --style display using template map file
3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	117 --template display with template
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	118
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	119 use "hg -v help rebase" to show global options
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	120
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	121 % Use continue/abort and dest/source
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	122 hg rebase: abort and continue do not allow specifying revisions
10636 23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	123 hg rebase [-s REV \| -b REV] [-d REV] [options]
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	124 hg rebase {-a\|-c}
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	125
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	126 move changeset (and descendants) to a different branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	127
9073 ec1cd3176625 rebase: wrapped docstrings at 78 characters Martin Geisler <mg@lazybytes.net> parents: 8076 diff changeset	128 Rebase uses repeated merging to graft changesets from one part of history
10636 23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	129 (the source) onto another (the destination). This can be useful for
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	130 linearizing local changes relative to a master development tree.
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	131
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	132 If you don't specify a destination changeset ("-d/--dest"), rebase uses
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	133 the tipmost head of the current named branch as the destination. (The
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	134 destination changeset is not modified by rebasing, but new changesets are
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	135 added as its descendants.)
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	136
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	137 You can specify which changesets to rebase in two ways: as a "source"
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	138 changeset or as a "base" changeset. Both are shorthand for a topologically
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	139 related set of changesets (the "source branch"). If you specify source
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	140 ("-s/--source"), rebase will rebase that changeset and all of its
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	141 descendants onto dest. If you specify base ("-b/--base"), rebase will
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	142 select ancestors of base back to but not including the common ancestor
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	143 with dest. Thus, "-b" is less precise but more convenient than "-s": you
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	144 can specify any changeset in the source branch, and rebase will select the
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	145 whole branch. If you specify neither "-s" nor "-b", rebase uses the parent
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	146 of the working directory as the base.
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	147
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	148 By default, rebase recreates the changesets in the source branch as
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	149 descendants of dest and then destroys the originals. Use "--keep" to
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	150 preserve the original source changesets. Some changesets in the source
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	151 branch (e.g. merges from the destination branch) may be dropped if they no
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	152 longer contribute any change.
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	153
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	154 One result of the rules for selecting the destination changeset and source
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	155 branch is that, unlike "merge", rebase will do nothing if you are at the
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	156 latest (tipmost) head of a named branch with two heads. You need to
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	157 explicitly specify source and/or destination (or "update" to the other
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	158 head, if it's the head of the intended source branch).
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	159
7999 b25110140573 rebase: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7951 diff changeset	160 If a rebase is interrupted to manually resolve a merge, it can be
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8031 diff changeset	161 continued with --continue/-c or aborted with --abort/-a.
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	162
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	163 options:
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	164
10636 23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	165 -s --source rebase from the specified changeset
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	166 -b --base rebase from the base of the specified changeset (up to
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	167 greatest common ancestor of base and dest)
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	168 -d --dest rebase onto the specified changeset
9589 fdf0c375cdbf rebase: change rebase help to talk about changesets and branch names timeless@mozdev.org parents: 8076 diff changeset	169 --collapse collapse the rebased changesets
fdf0c375cdbf rebase: change rebase help to talk about changesets and branch names timeless@mozdev.org parents: 8076 diff changeset	170 --keep keep original changesets
fdf0c375cdbf rebase: change rebase help to talk about changesets and branch names timeless@mozdev.org parents: 8076 diff changeset	171 --keepbranches keep original branch names
10352 66d954e76ffb rebase: add --detach option to detach intermediate revisions (issue1950) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 9599 diff changeset	172 --detach force detaching of source from its original branch
7468 3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	173 -c --continue continue an interrupted rebase
3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	174 -a --abort abort an interrupted rebase
3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	175 --style display using template map file
3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	176 --template display with template
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	177
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	178 use "hg -v help rebase" to show global options
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	179
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	180 % Use source and base
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	181 hg rebase: cannot specify both a revision and a base
10636 23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	182 hg rebase [-s REV \| -b REV] [-d REV] [options]
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	183 hg rebase {-a\|-c}
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	184
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	185 move changeset (and descendants) to a different branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	186
9073 ec1cd3176625 rebase: wrapped docstrings at 78 characters Martin Geisler <mg@lazybytes.net> parents: 8076 diff changeset	187 Rebase uses repeated merging to graft changesets from one part of history
10636 23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	188 (the source) onto another (the destination). This can be useful for
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	189 linearizing local changes relative to a master development tree.
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	190
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	191 If you don't specify a destination changeset ("-d/--dest"), rebase uses
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	192 the tipmost head of the current named branch as the destination. (The
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	193 destination changeset is not modified by rebasing, but new changesets are
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	194 added as its descendants.)
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	195
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	196 You can specify which changesets to rebase in two ways: as a "source"
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	197 changeset or as a "base" changeset. Both are shorthand for a topologically
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	198 related set of changesets (the "source branch"). If you specify source
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	199 ("-s/--source"), rebase will rebase that changeset and all of its
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	200 descendants onto dest. If you specify base ("-b/--base"), rebase will
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	201 select ancestors of base back to but not including the common ancestor
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	202 with dest. Thus, "-b" is less precise but more convenient than "-s": you
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	203 can specify any changeset in the source branch, and rebase will select the
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	204 whole branch. If you specify neither "-s" nor "-b", rebase uses the parent
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	205 of the working directory as the base.
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	206
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	207 By default, rebase recreates the changesets in the source branch as
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	208 descendants of dest and then destroys the originals. Use "--keep" to
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	209 preserve the original source changesets. Some changesets in the source
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	210 branch (e.g. merges from the destination branch) may be dropped if they no
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	211 longer contribute any change.
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	212
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	213 One result of the rules for selecting the destination changeset and source
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	214 branch is that, unlike "merge", rebase will do nothing if you are at the
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	215 latest (tipmost) head of a named branch with two heads. You need to
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	216 explicitly specify source and/or destination (or "update" to the other
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	217 head, if it's the head of the intended source branch).
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	218
7999 b25110140573 rebase: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7951 diff changeset	219 If a rebase is interrupted to manually resolve a merge, it can be
8076 5ec526c1a32f help texts: write command line switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8031 diff changeset	220 continued with --continue/-c or aborted with --abort/-a.
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	221
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	222 options:
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	223
10636 23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	224 -s --source rebase from the specified changeset
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	225 -b --base rebase from the base of the specified changeset (up to
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	226 greatest common ancestor of base and dest)
23ab3b05bd66 rebase: improve help text Greg Ward <greg-hg@gerg.ca> parents: 10352 diff changeset	227 -d --dest rebase onto the specified changeset
9589 fdf0c375cdbf rebase: change rebase help to talk about changesets and branch names timeless@mozdev.org parents: 8076 diff changeset	228 --collapse collapse the rebased changesets
fdf0c375cdbf rebase: change rebase help to talk about changesets and branch names timeless@mozdev.org parents: 8076 diff changeset	229 --keep keep original changesets
fdf0c375cdbf rebase: change rebase help to talk about changesets and branch names timeless@mozdev.org parents: 8076 diff changeset	230 --keepbranches keep original branch names
10352 66d954e76ffb rebase: add --detach option to detach intermediate revisions (issue1950) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 9599 diff changeset	231 --detach force detaching of source from its original branch
7468 3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	232 -c --continue continue an interrupted rebase
3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	233 -a --abort abort an interrupted rebase
3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	234 --style display using template map file
3e5db4228f8f rebase: add support to keep branch names Augie Fackler <durin42@gmail.com> parents: 7130 diff changeset	235 --template display with template
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	236
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	237 use "hg -v help rebase" to show global options
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	238
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	239 % Rebase with no arguments - from current
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	240 nothing to rebase
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	241
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	242 % Rebase with no arguments - from the current branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	243 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	244 nothing to rebase
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	245 % ----------
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	246 % These work
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	247
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	248 % Rebase with no arguments (from 3 onto 7)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	249 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	250 saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	251 adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	252 adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	253 adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	254 adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	255 added 5 changesets with 5 changes to 5 files
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	256 rebase completed
7130 204c7850c158 rebase: disable rollback after rebasing Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	257 % Try to rollback after a rebase (fail)
204c7850c158 rebase: disable rollback after rebasing Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	258 no rollback information available
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	259
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	260 % Rebase with base == '.' => same as no arguments (from 3 onto 7)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	261 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	262 saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	263 adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	264 adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	265 adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	266 adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	267 added 5 changesets with 5 changes to 5 files
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	268 rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	269
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	270 % Rebase with dest == default => same as no arguments (from 3 onto 7)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	271 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	272 saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	273 adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	274 adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	275 adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	276 adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	277 added 5 changesets with 5 changes to 5 files
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	278 rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	279
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	280 % Specify only source (from 4 onto 7)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	281 saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	282 adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	283 adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	284 adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	285 adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	286 added 4 changesets with 4 changes to 4 files (-1 heads)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	287 rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	288
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	289 % Specify only dest (from 3 onto 6)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	290 3 files updated, 0 files merged, 3 files removed, 0 files unresolved
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	291 saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	292 adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	293 adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	294 adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	295 adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	296 added 5 changesets with 5 changes to 5 files (+1 heads)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	297 rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	298
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	299 % Specify only base (from 3 onto 7)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	300 saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	301 adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	302 adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	303 adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	304 adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	305 added 5 changesets with 5 changes to 5 files
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	306 rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	307
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	308 % Specify source and dest (from 4 onto 6)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	309 saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	310 adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	311 adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	312 adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	313 adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	314 added 4 changesets with 4 changes to 4 files
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	315 rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	316
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	317 % Specify base and dest (from 3 onto 6)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	318 saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	319 adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	320 adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	321 adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	322 adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	323 added 5 changesets with 5 changes to 5 files (+1 heads)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	324 rebase completed

Mercurial > public > mercurial-scm > hg

annotate tests/test-rebase-parameters.out @ 11109:a2bc2f2d77a9