Mercurial > hg
comparison tests/test-rebase-parameters.out @ 7468:3e5db4228f8f
rebase: add support to keep branch names
Callback on extra fields added by Patrick Mezard <pmezard@gmail.com>.
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Tue, 18 Nov 2008 21:46:01 -0600 |
| parents | 204c7850c158 |
| children | 4d9e8efb7326 |
comparison
equal
deleted
inserted
replaced
| 7465:8f0305874701 | 7468:3e5db4228f8f |
|---|---|
| 13 If a rebase is interrupted to manually resolve a merge, it can be continued | 13 If a rebase is interrupted to manually resolve a merge, it can be continued |
| 14 with --continue or aborted with --abort. | 14 with --continue or aborted with --abort. |
| 15 | 15 |
| 16 options: | 16 options: |
| 17 | 17 |
| 18 --keep keep original revisions | 18 --keep keep original revisions |
| 19 -s --source rebase from a given revision | 19 --keepbranches keep original branches |
| 20 -b --base rebase from the base of a given revision | 20 -s --source rebase from a given revision |
| 21 -d --dest rebase onto a given revision | 21 -b --base rebase from the base of a given revision |
| 22 --collapse collapse the rebased revisions | 22 -d --dest rebase onto a given revision |
| 23 -c --continue continue an interrupted rebase | 23 --collapse collapse the rebased revisions |
| 24 -a --abort abort an interrupted rebase | 24 -c --continue continue an interrupted rebase |
| 25 --style display using template map file | 25 -a --abort abort an interrupted rebase |
| 26 --template display with template | 26 --style display using template map file |
| 27 --template display with template | |
| 27 | 28 |
| 28 use "hg -v help rebase" to show global options | 29 use "hg -v help rebase" to show global options |
| 29 | 30 |
| 30 % Use continue and collapse | 31 % Use continue and collapse |
| 31 hg rebase: cannot use collapse with continue or abort | 32 hg rebase: cannot use collapse with continue or abort |
| 40 If a rebase is interrupted to manually resolve a merge, it can be continued | 41 If a rebase is interrupted to manually resolve a merge, it can be continued |
| 41 with --continue or aborted with --abort. | 42 with --continue or aborted with --abort. |
| 42 | 43 |
| 43 options: | 44 options: |
| 44 | 45 |
| 45 --keep keep original revisions | 46 --keep keep original revisions |
| 46 -s --source rebase from a given revision | 47 --keepbranches keep original branches |
| 47 -b --base rebase from the base of a given revision | 48 -s --source rebase from a given revision |
| 48 -d --dest rebase onto a given revision | 49 -b --base rebase from the base of a given revision |
| 49 --collapse collapse the rebased revisions | 50 -d --dest rebase onto a given revision |
| 50 -c --continue continue an interrupted rebase | 51 --collapse collapse the rebased revisions |
| 51 -a --abort abort an interrupted rebase | 52 -c --continue continue an interrupted rebase |
| 52 --style display using template map file | 53 -a --abort abort an interrupted rebase |
| 53 --template display with template | 54 --style display using template map file |
| 55 --template display with template | |
| 54 | 56 |
| 55 use "hg -v help rebase" to show global options | 57 use "hg -v help rebase" to show global options |
| 56 | 58 |
| 57 % Use continue/abort and dest/source | 59 % Use continue/abort and dest/source |
| 58 hg rebase: abort and continue do not allow specifying revisions | 60 hg rebase: abort and continue do not allow specifying revisions |
| 67 If a rebase is interrupted to manually resolve a merge, it can be continued | 69 If a rebase is interrupted to manually resolve a merge, it can be continued |
| 68 with --continue or aborted with --abort. | 70 with --continue or aborted with --abort. |
| 69 | 71 |
| 70 options: | 72 options: |
| 71 | 73 |
| 72 --keep keep original revisions | 74 --keep keep original revisions |
| 73 -s --source rebase from a given revision | 75 --keepbranches keep original branches |
| 74 -b --base rebase from the base of a given revision | 76 -s --source rebase from a given revision |
| 75 -d --dest rebase onto a given revision | 77 -b --base rebase from the base of a given revision |
| 76 --collapse collapse the rebased revisions | 78 -d --dest rebase onto a given revision |
| 77 -c --continue continue an interrupted rebase | 79 --collapse collapse the rebased revisions |
| 78 -a --abort abort an interrupted rebase | 80 -c --continue continue an interrupted rebase |
| 79 --style display using template map file | 81 -a --abort abort an interrupted rebase |
| 80 --template display with template | 82 --style display using template map file |
| 83 --template display with template | |
| 81 | 84 |
| 82 use "hg -v help rebase" to show global options | 85 use "hg -v help rebase" to show global options |
| 83 | 86 |
| 84 % Use source and base | 87 % Use source and base |
| 85 hg rebase: cannot specify both a revision and a base | 88 hg rebase: cannot specify both a revision and a base |
| 94 If a rebase is interrupted to manually resolve a merge, it can be continued | 97 If a rebase is interrupted to manually resolve a merge, it can be continued |
| 95 with --continue or aborted with --abort. | 98 with --continue or aborted with --abort. |
| 96 | 99 |
| 97 options: | 100 options: |
| 98 | 101 |
| 99 --keep keep original revisions | 102 --keep keep original revisions |
| 100 -s --source rebase from a given revision | 103 --keepbranches keep original branches |
| 101 -b --base rebase from the base of a given revision | 104 -s --source rebase from a given revision |
| 102 -d --dest rebase onto a given revision | 105 -b --base rebase from the base of a given revision |
| 103 --collapse collapse the rebased revisions | 106 -d --dest rebase onto a given revision |
| 104 -c --continue continue an interrupted rebase | 107 --collapse collapse the rebased revisions |
| 105 -a --abort abort an interrupted rebase | 108 -c --continue continue an interrupted rebase |
| 106 --style display using template map file | 109 -a --abort abort an interrupted rebase |
| 107 --template display with template | 110 --style display using template map file |
| 111 --template display with template | |
| 108 | 112 |
| 109 use "hg -v help rebase" to show global options | 113 use "hg -v help rebase" to show global options |
| 110 | 114 |
| 111 % Rebase with no arguments - from current | 115 % Rebase with no arguments - from current |
| 112 nothing to rebase | 116 nothing to rebase |