Mercurial > evolve

comparison docs/troubles-handling.rst @ 5505:c7a5133e4a7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unstable-list: add local table of content of each details section
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 26 Aug 2020 13:07:57 +0200
parents a2274a848008
children c408a31d8883
comparison
equal deleted inserted replaced
5504:a2274a848008 5505:c7a5133e4a7c
66 * rebasing might lead to conflict. 66 * rebasing might lead to conflict.
67 67
68 Details of Sub cases 68 Details of Sub cases
69 ******************** 69 ********************
70 70
71 .. contents::
72 :local:
73
71 O-A: Linear changeset (one parent) 74 O-A: Linear changeset (one parent)
72 ================================== 75 ==================================
73 76
74 O-A1: parent has a single successors 77 O-A1: parent has a single successors
75 ------------------------------------ 78 ------------------------------------
198 * rebasing might lead to conflict. 201 * rebasing might lead to conflict.
199 202
200 Details of Sub cases 203 Details of Sub cases
201 ******************** 204 ********************
202 205
206 .. contents::
207 :local:
208
203 #TODO: yet to document 209 #TODO: yet to document
204 210
205 Content-Divergence 211 Content-Divergence
206 ################## 212 ##################
207 213
244 * divergent changeset can be orphan as well 250 * divergent changeset can be orphan as well
245 * one side of divergence is in public phase 251 * one side of divergence is in public phase
246 252
247 Details of Sub cases 253 Details of Sub cases
248 ******************** 254 ********************
255
256 .. contents::
257 :local: