Mercurial > evolve
comparison tests/test-topic-stack-complex.t @ 4190:883e75e0a810 stable
topicidx: stop assigning index number to obsolete changesets
Obsolete changeset are no longer part of the stack, the old logic tried to
assigns them the index of their successors but this is flacky and error prone.
So we stop doing so.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 17 Oct 2018 14:47:38 +0200 |
| parents | 36d559ca5332 |
| children | 2a7f89817540 470ba668687a |
comparison
equal
deleted
inserted
replaced
| 4189:36d559ca5332 | 4190:883e75e0a810 |
|---|---|
| 166 s4@ Added e and f (current) | 166 s4@ Added e and f (current) |
| 167 s3: split2 | 167 s3: split2 |
| 168 s2: split1 | 168 s2: split1 |
| 169 s1: Added a and b | 169 s1: Added a and b |
| 170 s0^ Added foo (base) | 170 s0^ Added foo (base) |
| 171 | |
| 172 $ hg evolve --content-divergent -r ec94a1ed1330 | |
| 173 merge:[s5] Added e and f | |
| 174 with: [s4] Added e and f | |
| 175 base: [s] Added e and f | |
| 176 updating to "local" side of the conflict: ec94a1ed1330 | |
| 177 merging "other" content-divergent changeset 'f2eff98490d2' | |
| 178 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 179 working directory is now at 8faad6276dc6 |