Mercurial > hg-stable

changeset 11188:b5c0f6a11430 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 db2897926d14
children 3ef2572de32f 6798536454e6
files hgext/rebase.py tests/test-rebase-parameters.out
diffstat 2 files changed, 30 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Mon May 17 20:42:28 2010 +0200
+++ b/hgext/rebase.py	Mon May 17 21:16:35 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/tests/test-rebase-parameters.out	Mon May 17 20:42:28 2010 +0200
+++ b/tests/test-rebase-parameters.out	Mon May 17 21:16:35 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