Mercurial > hg
comparison mercurial/obsolete.py @ 29894:02c150850e16
obsolete: fix minor module documentation issues
author | liscju <piotr.listkiewicz@gmail.com> |
---|---|
date | Fri, 02 Sep 2016 10:18:56 +0200 |
parents | 98e8313dcd9e |
children | 42d031560294 |
comparison
equal
deleted
inserted
replaced
29893:4c28ddda5d48 | 29894:02c150850e16 |
---|---|
40 | 40 |
41 - When changeset A is simply "pruned" from the graph, a marker is created: | 41 - When changeset A is simply "pruned" from the graph, a marker is created: |
42 | 42 |
43 (A, ()) | 43 (A, ()) |
44 | 44 |
45 - When changeset A is split into B and C, a single marker are used: | 45 - When changeset A is split into B and C, a single marker is used: |
46 | 46 |
47 (A, (C, C)) | 47 (A, (B, C)) |
48 | 48 |
49 We use a single marker to distinguish the "split" case from the "divergence" | 49 We use a single marker to distinguish the "split" case from the "divergence" |
50 case. If two independent operations rewrite the same changeset A in to A' and | 50 case. If two independent operations rewrite the same changeset A in to A' and |
51 A'', we have an error case: divergent rewriting. We can detect it because | 51 A'', we have an error case: divergent rewriting. We can detect it because |
52 two markers will be created independently: | 52 two markers will be created independently: |