Mercurial > hg-stable
changeset 11189:3ef2572de32f
Merge with stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Mon, 17 May 2010 21:30:00 +0200 |
| parents | a890cc501501 (current diff) b5c0f6a11430 (diff) |
| children | 43337076ba92 |
| files | hgext/rebase.py mercurial/minirst.py |
| diffstat | 3 files changed, 31 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Sun May 16 14:38:32 2010 -0500 +++ b/hgext/rebase.py Mon May 17 21:30:00 2010 +0200 @@ -29,9 +29,14 @@ Rebase uses repeated merging to graft changesets from one part of history (the source) onto another (the destination). This can be - useful for linearizing local changes relative to a master + useful for linearizing *local* changes relative to a master development tree. + You should not rebase changesets that have already been shared + with others. Doing so will force everybody else to perform the + same rebase or they will end up with duplicated changesets after + pulling in your rebased changesets. + If you don't specify a destination changeset (``-d/--dest``), rebase uses the tipmost head of the current named branch as the destination. (The destination changeset is not modified by
--- a/mercurial/minirst.py Sun May 16 14:38:32 2010 -0500 +++ b/mercurial/minirst.py Mon May 17 21:30:00 2010 +0200 @@ -373,7 +373,7 @@ text = open(sys.argv[1]).read() blocks = debug(findblocks, text) blocks = debug(findliteralblocks, blocks) - blocks = debug(prunecontainers, blocks, sys.argv[2:]) + blocks, pruned = debug(prunecontainers, blocks, sys.argv[2:]) blocks = debug(inlineliterals, blocks) blocks = debug(splitparagraphs, blocks) blocks = debug(updatefieldlists, blocks)
--- a/tests/test-rebase-parameters.out Sun May 16 14:38:32 2010 -0500 +++ b/tests/test-rebase-parameters.out Mon May 17 21:30:00 2010 +0200 @@ -9,7 +9,12 @@ Rebase uses repeated merging to graft changesets from one part of history (the source) onto another (the destination). This can be useful for - linearizing local changes relative to a master development tree. + linearizing *local* changes relative to a master development tree. + + You should not rebase changesets that have already been shared with + others. Doing so will force everybody else to perform the same rebase or + they will end up with duplicated changesets after pulling in your rebased + changesets. If you don't specify a destination changeset ("-d/--dest"), rebase uses the tipmost head of the current named branch as the destination. (The @@ -68,7 +73,12 @@ Rebase uses repeated merging to graft changesets from one part of history (the source) onto another (the destination). This can be useful for - linearizing local changes relative to a master development tree. + linearizing *local* changes relative to a master development tree. + + You should not rebase changesets that have already been shared with + others. Doing so will force everybody else to perform the same rebase or + they will end up with duplicated changesets after pulling in your rebased + changesets. If you don't specify a destination changeset ("-d/--dest"), rebase uses the tipmost head of the current named branch as the destination. (The @@ -127,7 +137,12 @@ Rebase uses repeated merging to graft changesets from one part of history (the source) onto another (the destination). This can be useful for - linearizing local changes relative to a master development tree. + linearizing *local* changes relative to a master development tree. + + You should not rebase changesets that have already been shared with + others. Doing so will force everybody else to perform the same rebase or + they will end up with duplicated changesets after pulling in your rebased + changesets. If you don't specify a destination changeset ("-d/--dest"), rebase uses the tipmost head of the current named branch as the destination. (The @@ -186,7 +201,12 @@ Rebase uses repeated merging to graft changesets from one part of history (the source) onto another (the destination). This can be useful for - linearizing local changes relative to a master development tree. + linearizing *local* changes relative to a master development tree. + + You should not rebase changesets that have already been shared with + others. Doing so will force everybody else to perform the same rebase or + they will end up with duplicated changesets after pulling in your rebased + changesets. If you don't specify a destination changeset ("-d/--dest"), rebase uses the tipmost head of the current named branch as the destination. (The