Mercurial > evolve
comparison CHANGELOG @ 5730:a119432bafc1
divergence-resolution: deal with simple "just one moved case" earlier
While deciding the resolution parent for content-divergence resolution, now we
use 3-way merge logic to check, if only one of them was moved from its original
position by comparing the parent of both divergent cset with parent of base.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Fri, 22 Jan 2021 05:37:43 +0100 |
| parents | 61d2f1cf90f0 |
| children | 7daa67934798 |
comparison
equal
deleted
inserted
replaced
| 5729:3a1e07c27e4a | 5730:a119432bafc1 |
|---|---|
| 3 | 3 |
| 4 10.1.1 -- in progress | 4 10.1.1 -- in progress |
| 5 --------------------- | 5 --------------------- |
| 6 | 6 |
| 7 * evolve: remove spurious "working directory is now at ..." messages | 7 * evolve: remove spurious "working directory is now at ..." messages |
| 8 * evolve: improve resolution of some case of parent divergence | |
| 8 | 9 |
| 9 topic: | 10 topic: |
| 10 | 11 |
| 11 * rebase: prevent in-memory rebase to silently drop topic (by disable the feature) | 12 * rebase: prevent in-memory rebase to silently drop topic (by disable the feature) |
| 12 | 13 |