Mercurial > evolve

diff docs/troubles-handling.rst @ 5500:43eb23c28782

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unstable-list: add cause-of-trouble for content-divergence
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Tue, 18 Aug 2020 12:35:24 +0530
parents fb5a675f9676
children 90074635c1f8
line wrap: on
line diff
--- a/docs/troubles-handling.rst	Tue Aug 18 19:32:13 2020 +0530
+++ b/docs/troubles-handling.rst	Tue Aug 18 12:35:24 2020 +0530
@@ -221,8 +221,12 @@
 Cause of trouble
 ****************
 
-XXX need details about local creation and remote creation. (revealed at pull
-time).
+It can appear locally if a user independently rewrite the same changeset multiple
+times.
+
+Content-divergence can also happens when the users rewrite draft changesets that got
+rewritten in another repository as well. The content divergence then "revealed"
+when the rewriting information is shared (pulled/pushed) with another repository.
 
 Source of Complexity
 ********************