Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 10351:38fe86fb16e3 | 10352:66d954e76ffb |
|---|---|
| 1 % These fail | 1 % These fail |
| 2 | 2 |
| 3 % Use continue and abort | 3 % Use continue and abort |
| 4 hg rebase: cannot use both abort and continue | 4 hg rebase: cannot use both abort and continue |
| 5 hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] | 5 hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a] |
| 6 | 6 |
| 7 move changeset (and descendants) to a different branch | 7 move changeset (and descendants) to a different branch |
| 8 | 8 |
| 9 Rebase uses repeated merging to graft changesets from one part of history | 9 Rebase uses repeated merging to graft changesets from one part of history |
| 10 onto another. This can be useful for linearizing local changes relative to | 10 onto another. This can be useful for linearizing local changes relative to |
| 11 a master development tree. | 11 a master development tree. |
| 12 | 12 |
| 13 If a rebase is interrupted to manually resolve a merge, it can be | 13 If a rebase is interrupted to manually resolve a merge, it can be |
| 14 continued with --continue/-c or aborted with --abort/-a. | 14 continued with --continue/-c or aborted with --abort/-a. |
| 15 | 15 |
| 16 options: | 16 options: |
| 17 | 17 |
| 18 -s --source rebase from a given revision | 18 -s --source rebase from a given revision |
| 19 -b --base rebase from the base of a given revision | 19 -b --base rebase from the base of a given revision |
| 20 -d --dest rebase onto a given revision | 20 -d --dest rebase onto a given revision |
| 21 --collapse collapse the rebased changesets | 21 --collapse collapse the rebased changesets |
| 22 --keep keep original changesets | 22 --keep keep original changesets |
| 23 --keepbranches keep original branch names | 23 --keepbranches keep original branch names |
| 24 --detach force detaching of source from its original branch | |
| 24 -c --continue continue an interrupted rebase | 25 -c --continue continue an interrupted rebase |
| 25 -a --abort abort an interrupted rebase | 26 -a --abort abort an interrupted rebase |
| 26 --style display using template map file | 27 --style display using template map file |
| 27 --template display with template | 28 --template display with template |
| 28 | 29 |
| 29 use "hg -v help rebase" to show global options | 30 use "hg -v help rebase" to show global options |
| 30 | 31 |
| 31 % Use continue and collapse | 32 % Use continue and collapse |
| 32 hg rebase: cannot use collapse with continue or abort | 33 hg rebase: cannot use collapse with continue or abort |
| 33 hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] | 34 hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a] |
| 34 | 35 |
| 35 move changeset (and descendants) to a different branch | 36 move changeset (and descendants) to a different branch |
| 36 | 37 |
| 37 Rebase uses repeated merging to graft changesets from one part of history | 38 Rebase uses repeated merging to graft changesets from one part of history |
| 38 onto another. This can be useful for linearizing local changes relative to | 39 onto another. This can be useful for linearizing local changes relative to |
| 39 a master development tree. | 40 a master development tree. |
| 40 | 41 |
| 41 If a rebase is interrupted to manually resolve a merge, it can be | 42 If a rebase is interrupted to manually resolve a merge, it can be |
| 42 continued with --continue/-c or aborted with --abort/-a. | 43 continued with --continue/-c or aborted with --abort/-a. |
| 43 | 44 |
| 44 options: | 45 options: |
| 45 | 46 |
| 46 -s --source rebase from a given revision | 47 -s --source rebase from a given revision |
| 47 -b --base rebase from the base of a given revision | 48 -b --base rebase from the base of a given revision |
| 48 -d --dest rebase onto a given revision | 49 -d --dest rebase onto a given revision |
| 49 --collapse collapse the rebased changesets | 50 --collapse collapse the rebased changesets |
| 50 --keep keep original changesets | 51 --keep keep original changesets |
| 51 --keepbranches keep original branch names | 52 --keepbranches keep original branch names |
| 53 --detach force detaching of source from its original branch | |
| 52 -c --continue continue an interrupted rebase | 54 -c --continue continue an interrupted rebase |
| 53 -a --abort abort an interrupted rebase | 55 -a --abort abort an interrupted rebase |
| 54 --style display using template map file | 56 --style display using template map file |
| 55 --template display with template | 57 --template display with template |
| 56 | 58 |
| 57 use "hg -v help rebase" to show global options | 59 use "hg -v help rebase" to show global options |
| 58 | 60 |
| 59 % Use continue/abort and dest/source | 61 % Use continue/abort and dest/source |
| 60 hg rebase: abort and continue do not allow specifying revisions | 62 hg rebase: abort and continue do not allow specifying revisions |
| 61 hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] | 63 hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a] |
| 62 | 64 |
| 63 move changeset (and descendants) to a different branch | 65 move changeset (and descendants) to a different branch |
| 64 | 66 |
| 65 Rebase uses repeated merging to graft changesets from one part of history | 67 Rebase uses repeated merging to graft changesets from one part of history |
| 66 onto another. This can be useful for linearizing local changes relative to | 68 onto another. This can be useful for linearizing local changes relative to |
| 67 a master development tree. | 69 a master development tree. |
| 68 | 70 |
| 69 If a rebase is interrupted to manually resolve a merge, it can be | 71 If a rebase is interrupted to manually resolve a merge, it can be |
| 70 continued with --continue/-c or aborted with --abort/-a. | 72 continued with --continue/-c or aborted with --abort/-a. |
| 71 | 73 |
| 72 options: | 74 options: |
| 73 | 75 |
| 74 -s --source rebase from a given revision | 76 -s --source rebase from a given revision |
| 75 -b --base rebase from the base of a given revision | 77 -b --base rebase from the base of a given revision |
| 76 -d --dest rebase onto a given revision | 78 -d --dest rebase onto a given revision |
| 77 --collapse collapse the rebased changesets | 79 --collapse collapse the rebased changesets |
| 78 --keep keep original changesets | 80 --keep keep original changesets |
| 79 --keepbranches keep original branch names | 81 --keepbranches keep original branch names |
| 82 --detach force detaching of source from its original branch | |
| 80 -c --continue continue an interrupted rebase | 83 -c --continue continue an interrupted rebase |
| 81 -a --abort abort an interrupted rebase | 84 -a --abort abort an interrupted rebase |
| 82 --style display using template map file | 85 --style display using template map file |
| 83 --template display with template | 86 --template display with template |
| 84 | 87 |
| 85 use "hg -v help rebase" to show global options | 88 use "hg -v help rebase" to show global options |
| 86 | 89 |
| 87 % Use source and base | 90 % Use source and base |
| 88 hg rebase: cannot specify both a revision and a base | 91 hg rebase: cannot specify both a revision and a base |
| 89 hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] | 92 hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a] |
| 90 | 93 |
| 91 move changeset (and descendants) to a different branch | 94 move changeset (and descendants) to a different branch |
| 92 | 95 |
| 93 Rebase uses repeated merging to graft changesets from one part of history | 96 Rebase uses repeated merging to graft changesets from one part of history |
| 94 onto another. This can be useful for linearizing local changes relative to | 97 onto another. This can be useful for linearizing local changes relative to |
| 95 a master development tree. | 98 a master development tree. |
| 96 | 99 |
| 97 If a rebase is interrupted to manually resolve a merge, it can be | 100 If a rebase is interrupted to manually resolve a merge, it can be |
| 98 continued with --continue/-c or aborted with --abort/-a. | 101 continued with --continue/-c or aborted with --abort/-a. |
| 99 | 102 |
| 100 options: | 103 options: |
| 101 | 104 |
| 102 -s --source rebase from a given revision | 105 -s --source rebase from a given revision |
| 103 -b --base rebase from the base of a given revision | 106 -b --base rebase from the base of a given revision |
| 104 -d --dest rebase onto a given revision | 107 -d --dest rebase onto a given revision |
| 105 --collapse collapse the rebased changesets | 108 --collapse collapse the rebased changesets |
| 106 --keep keep original changesets | 109 --keep keep original changesets |
| 107 --keepbranches keep original branch names | 110 --keepbranches keep original branch names |
| 111 --detach force detaching of source from its original branch | |
| 108 -c --continue continue an interrupted rebase | 112 -c --continue continue an interrupted rebase |
| 109 -a --abort abort an interrupted rebase | 113 -a --abort abort an interrupted rebase |
| 110 --style display using template map file | 114 --style display using template map file |
| 111 --template display with template | 115 --template display with template |
| 112 | 116 |