Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-parameters.out @ 10352:66d954e76ffb
rebase: add --detach option to detach intermediate revisions (issue1950)
When rebasing an intermediate revision, rebase keeps a parent relationship
with the original parent. This option forces the removal of this relationship.
In more depth, it 'fakes' null merges between the target revision and the
ancestors of source, dropping every change from the ancestors.
The result is that every change in source and its descendants will be rebased,
ignoring the changes in its ancestors.
| author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
|---|---|
| date | Sat, 06 Feb 2010 10:51:50 +0100 |
| parents | f3404b7f37ca |
| children | 23ab3b05bd66 |
line wrap: on
line diff
--- a/tests/test-rebase-parameters.out Sun Jan 31 13:30:17 2010 +0100 +++ b/tests/test-rebase-parameters.out Sat Feb 06 10:51:50 2010 +0100 @@ -2,7 +2,7 @@ % Use continue and abort hg rebase: cannot use both abort and continue -hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] +hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a] move changeset (and descendants) to a different branch @@ -21,6 +21,7 @@ --collapse collapse the rebased changesets --keep keep original changesets --keepbranches keep original branch names + --detach force detaching of source from its original branch -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file @@ -30,7 +31,7 @@ % Use continue and collapse hg rebase: cannot use collapse with continue or abort -hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] +hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a] move changeset (and descendants) to a different branch @@ -49,6 +50,7 @@ --collapse collapse the rebased changesets --keep keep original changesets --keepbranches keep original branch names + --detach force detaching of source from its original branch -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file @@ -58,7 +60,7 @@ % Use continue/abort and dest/source hg rebase: abort and continue do not allow specifying revisions -hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] +hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a] move changeset (and descendants) to a different branch @@ -77,6 +79,7 @@ --collapse collapse the rebased changesets --keep keep original changesets --keepbranches keep original branch names + --detach force detaching of source from its original branch -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file @@ -86,7 +89,7 @@ % Use source and base hg rebase: cannot specify both a revision and a base -hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] +hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a] move changeset (and descendants) to a different branch @@ -105,6 +108,7 @@ --collapse collapse the rebased changesets --keep keep original changesets --keepbranches keep original branch names + --detach force detaching of source from its original branch -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file