# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1274124600 -7200
# Node ID 3ef2572de32f715d51ea67ea2ca0d38d5fad36d8
# Parent  a890cc501501ac27350d74445b66bc055515cf10# Parent  b5c0f6a1143066c453032ab6dc4163ef52e932ee
Merge with stable

diff -r a890cc501501 -r 3ef2572de32f hgext/rebase.py
--- 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
diff -r a890cc501501 -r 3ef2572de32f mercurial/minirst.py
--- 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)
diff -r a890cc501501 -r 3ef2572de32f tests/test-rebase-parameters.out
--- 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