Mercurial > hg
comparison tests/test-rebase-parameters.out @ 11188:b5c0f6a11430 stable
rebase: stress that only local changesets should be rebased
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Mon, 17 May 2010 21:16:35 +0200 |
| parents | 86dc21148bdb |
| children | 4bb4895e1693 |
comparison
equal
deleted
inserted
replaced
| 11187:db2897926d14 | 11188:b5c0f6a11430 |
|---|---|
| 7 | 7 |
| 8 move changeset (and descendants) to a different branch | 8 move changeset (and descendants) to a different branch |
| 9 | 9 |
| 10 Rebase uses repeated merging to graft changesets from one part of history | 10 Rebase uses repeated merging to graft changesets from one part of history |
| 11 (the source) onto another (the destination). This can be useful for | 11 (the source) onto another (the destination). This can be useful for |
| 12 linearizing local changes relative to a master development tree. | 12 linearizing *local* changes relative to a master development tree. |
| 13 | |
| 14 You should not rebase changesets that have already been shared with | |
| 15 others. Doing so will force everybody else to perform the same rebase or | |
| 16 they will end up with duplicated changesets after pulling in your rebased | |
| 17 changesets. | |
| 13 | 18 |
| 14 If you don't specify a destination changeset ("-d/--dest"), rebase uses | 19 If you don't specify a destination changeset ("-d/--dest"), rebase uses |
| 15 the tipmost head of the current named branch as the destination. (The | 20 the tipmost head of the current named branch as the destination. (The |
| 16 destination changeset is not modified by rebasing, but new changesets are | 21 destination changeset is not modified by rebasing, but new changesets are |
| 17 added as its descendants.) | 22 added as its descendants.) |
| 66 | 71 |
| 67 move changeset (and descendants) to a different branch | 72 move changeset (and descendants) to a different branch |
| 68 | 73 |
| 69 Rebase uses repeated merging to graft changesets from one part of history | 74 Rebase uses repeated merging to graft changesets from one part of history |
| 70 (the source) onto another (the destination). This can be useful for | 75 (the source) onto another (the destination). This can be useful for |
| 71 linearizing local changes relative to a master development tree. | 76 linearizing *local* changes relative to a master development tree. |
| 77 | |
| 78 You should not rebase changesets that have already been shared with | |
| 79 others. Doing so will force everybody else to perform the same rebase or | |
| 80 they will end up with duplicated changesets after pulling in your rebased | |
| 81 changesets. | |
| 72 | 82 |
| 73 If you don't specify a destination changeset ("-d/--dest"), rebase uses | 83 If you don't specify a destination changeset ("-d/--dest"), rebase uses |
| 74 the tipmost head of the current named branch as the destination. (The | 84 the tipmost head of the current named branch as the destination. (The |
| 75 destination changeset is not modified by rebasing, but new changesets are | 85 destination changeset is not modified by rebasing, but new changesets are |
| 76 added as its descendants.) | 86 added as its descendants.) |
| 125 | 135 |
| 126 move changeset (and descendants) to a different branch | 136 move changeset (and descendants) to a different branch |
| 127 | 137 |
| 128 Rebase uses repeated merging to graft changesets from one part of history | 138 Rebase uses repeated merging to graft changesets from one part of history |
| 129 (the source) onto another (the destination). This can be useful for | 139 (the source) onto another (the destination). This can be useful for |
| 130 linearizing local changes relative to a master development tree. | 140 linearizing *local* changes relative to a master development tree. |
| 141 | |
| 142 You should not rebase changesets that have already been shared with | |
| 143 others. Doing so will force everybody else to perform the same rebase or | |
| 144 they will end up with duplicated changesets after pulling in your rebased | |
| 145 changesets. | |
| 131 | 146 |
| 132 If you don't specify a destination changeset ("-d/--dest"), rebase uses | 147 If you don't specify a destination changeset ("-d/--dest"), rebase uses |
| 133 the tipmost head of the current named branch as the destination. (The | 148 the tipmost head of the current named branch as the destination. (The |
| 134 destination changeset is not modified by rebasing, but new changesets are | 149 destination changeset is not modified by rebasing, but new changesets are |
| 135 added as its descendants.) | 150 added as its descendants.) |
| 184 | 199 |
| 185 move changeset (and descendants) to a different branch | 200 move changeset (and descendants) to a different branch |
| 186 | 201 |
| 187 Rebase uses repeated merging to graft changesets from one part of history | 202 Rebase uses repeated merging to graft changesets from one part of history |
| 188 (the source) onto another (the destination). This can be useful for | 203 (the source) onto another (the destination). This can be useful for |
| 189 linearizing local changes relative to a master development tree. | 204 linearizing *local* changes relative to a master development tree. |
| 205 | |
| 206 You should not rebase changesets that have already been shared with | |
| 207 others. Doing so will force everybody else to perform the same rebase or | |
| 208 they will end up with duplicated changesets after pulling in your rebased | |
| 209 changesets. | |
| 190 | 210 |
| 191 If you don't specify a destination changeset ("-d/--dest"), rebase uses | 211 If you don't specify a destination changeset ("-d/--dest"), rebase uses |
| 192 the tipmost head of the current named branch as the destination. (The | 212 the tipmost head of the current named branch as the destination. (The |
| 193 destination changeset is not modified by rebasing, but new changesets are | 213 destination changeset is not modified by rebasing, but new changesets are |
| 194 added as its descendants.) | 214 added as its descendants.) |