Mercurial > evolve
comparison CHANGELOG @ 5926:aca07ac01167
divergence-resolution: use last evolution date to choose p1 when merging
Before this patch, we choose the minimum revision as p1 while merging the
two divergent csets which had a drawback that if independent user resolve
the same divergence, their final resolved cset would have different hashes
(because of 'divergence_source_local' and 'divergence_source_other' extras).
Now, we decide the p1 on the basis of which of the two divergent cset
was rewritten more recently. This new logic removes the "different hash"
problem.
To save us from big output changes in the tests due to this change, I also
added the second factor i.e revision_number while sorting the csets wrt dates
(as date is same for all the csets in tests) to fallback to the old way of
picking the revision i.e choosing the minimum rev number.
And to demonstrate that now divergence resolution is independent of which
side user run the `hg evolve --content-div` resolved cset id won't change,
I have added a separate test file.
Flag --config devel.default-date='...' is being used here to record a
custom date in the obsmarkers.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 03 Mar 2021 12:40:59 +0530 |
| parents | 6bc94d126520 |
| children | aff365171309 |
comparison
equal
deleted
inserted
replaced
| 5925:e5250f24eed7 | 5926:aca07ac01167 |
|---|---|
| 3 | 3 |
| 4 10.4.0 - in progress | 4 10.4.0 - in progress |
| 5 -------------------- | 5 -------------------- |
| 6 | 6 |
| 7 * next: add an --abort flag | 7 * next: add an --abort flag |
| 8 * evolve: use a more stable criteria for picking p1 when solving | |
| 9 content-divergence (most recent evolution will be used). | |
| 8 | 10 |
| 9 10.3.1 -- 2021-04-25 | 11 10.3.1 -- 2021-04-25 |
| 10 -------------------- | 12 -------------------- |
| 11 | 13 |
| 12 * cache: fix corruption issue when mixing 32-bit and 64-bit environments | 14 * cache: fix corruption issue when mixing 32-bit and 64-bit environments |