Mercurial > evolve

comparison docs/troubles-handling.rst @ 5497:e7b70fe1297a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unstable-list: add source-of-complexity for phase-divergence
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Tue, 18 Aug 2020 08:47:15 +0530
parents 87aad54c0f1f
children f5d44464d72e
comparison
equal deleted inserted replaced
5496:87aad54c0f1f 5497:e7b70fe1297a
186 publishing information of the predecessors is pulled in the local repository. 186 publishing information of the predecessors is pulled in the local repository.
187 187
188 Source of Complexity 188 Source of Complexity
189 ******************** 189 ********************
190 190
191 * public version is a merge
192 * phase-divergent (bumped) changeset is a merge
193 * changeset was split (linear, over multiple topo branches)
194 * rebasing might lead to conflict.
195
191 Details of Sub cases 196 Details of Sub cases
192 ******************** 197 ********************
193 198
194 Content-Divergence 199 Content-Divergence
195 ################## 200 ##################