Mercurial > evolve

changeset 5491:1a238a9313da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unstable-list: some details about phase divergence
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 26 Aug 2020 12:39:47 +0200
parents 8f9dd2414416
children 76963e896ea6
files docs/troubles-handling.rst
diffstat 1 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/docs/troubles-handling.rst	Fri Aug 14 18:05:33 2020 +0200
+++ b/docs/troubles-handling.rst	Wed Aug 26 12:39:47 2020 +0200
@@ -198,8 +198,21 @@
 Cause of trouble
 ****************
 
+XXX need details about local creation and remote creation. (revealed at pull
+time).
+
 Source of Complexity
 ********************
 
+
+Before we perform a 3-way merge between the divergent changesets and common
+predecessor as base, there are some situations we need to take care of, like:
+
+* if divergent changesets moved, check which side moved in which direction,
+  and proceed accordingly
+* they moved on different unrelated branches
+* divergent changesets is orphan
+* one side of divergence is in public phase
+
 Details of Sub cases
 ********************