evolve merge requestshttps://foss.heptapod.net/mercurial/evolve/-/merge_requests2020-04-23T13:25:52Zhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/83WIP: obsorigin and obslog --origin2020-04-23T13:25:52ZAnton ShestakovWIP: obsorigin and obslog --originAnton ShestakovAnton Shestakovhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/78[precheck-orphan] evolve: add quotes around the action in msg of pre-checking2020-01-29T07:00:09ZSushil Khanchi[precheck-orphan] evolve: add quotes around the action in msg of pre-checkingAnton ShestakovAnton Shestakovhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/75[fix emptytopic] evolve: fix the buggy code of deciding destination for hg up...2019-12-26T17:06:26ZSushil Khanchi[fix emptytopic] evolve: fix the buggy code of deciding destination for hg update when topics are in playPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/66metaedit: use pre-checking before rewriting csets2019-12-22T19:44:34ZSushil Khanchimetaedit: use pre-checking before rewriting csetsChanges in test file demonstrate the changed behaviour.Changes in test file demonstrate the changed behaviour.Sushil KhanchiSushil Khanchihttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/65[refactor-contentdiv4] evolve: remove unnecessary code since it's been covere...2019-12-29T19:44:07ZSushil Khanchi[refactor-contentdiv4] evolve: remove unnecessary code since it's been covered alreadyWe don't need this logic any more since the case of "two divergent
csets where one is the parent of other" has been handled correctly
by the logic present in method _prepcontentdivresolution()
This is how things works in method _pre...We don't need this logic any more since the case of "two divergent
csets where one is the parent of other" has been handled correctly
by the logic present in method _prepcontentdivresolution()
This is how things works in method _prepcontentdivresolution()
for our case i.e "content-divergence with parent-child relation":
cset_b (content-divergent)
|
cset_a (content-divergent)
|
~
Acc. to revision selection criteria:
"divergent" = min_revision(cset_a, cset_b)
So always "divergent" will be cset_a and "other" will be "cset_b"
and resolution parent will be the successor of parent of cset_a.
Both the csets will be merged and resolution cset will be based on
correct revision.
The result could be wrong only in the case when "divergent" is cset_b
which is not possible acc. to the current logic.Sushil KhanchiSushil Khanchihttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/55[refactor-contentdiv2] refactor content-divergence resolution logic2020-06-08T09:14:55ZSushil Khanchi[refactor-contentdiv2] refactor content-divergence resolution logicSushil KhanchiSushil Khanchihttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/52merge with stable2019-12-12T11:50:29ZSushil Khanchimerge with stablehttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/46Topic/default/evolve one dirstate parent2019-11-21T00:08:17ZMartin von ZweigbergkTopic/default/evolve one dirstate parenthttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/43changelog: add a couple of missing entry about the next feature release2019-11-18T15:17:03ZPierre-Yves Davidchangelog: add a couple of missing entry about the next feature releaseMore missing entry, this time on default.More missing entry, this time on default.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/35WIP: More heptapod CI2019-11-15T11:15:53ZPierre-Yves DavidWIP: More heptapod CIThis merge request get use closer to fully testing evolution:
* [x] pure
* [ ] python3
* [ ] Rust ?This merge request get use closer to fully testing evolution:
* [x] pure
* [ ] python3
* [ ] Rust ?https://foss.heptapod.net/mercurial/evolve/-/merge_requests/34evolve: add pre-checking for phase-divergence2020-01-12T17:08:23ZSushil Khanchievolve: add pre-checking for phase-divergenceSushil KhanchiSushil Khanchihttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/33evolve: add pre-checking for content-divergence2020-01-12T17:55:46ZSushil Khanchievolve: add pre-checking for content-divergenceSushil KhanchiSushil Khanchihttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/21py3 fixes to doc build and packaging2019-10-22T23:39:23ZDenis Laxaldepy3 fixes to doc build and packaginghttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/19evolve: fix content-divergence resolution when p1 and/or p2 is null2019-12-08T16:40:02ZManuel Jacobevolve: fix content-divergence resolution when p1 and/or p2 is nullPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/18rewind: preserve date2019-10-22T23:39:48ZManuel Jacobrewind: preserve datehttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/5topic: avoid type error when convert gives repo.commitctx more arguments2019-09-13T14:52:28ZValentin Gatien-Barontopic: avoid type error when convert gives repo.commitctx more argumentsSpecifically, origctx, since d98ec36be808.
I tried running the tests, but I get a lot of unrelated diff ("1 new obsolescence markers" prints going away, a ton of "lines too long" errors in test-check-flake8, different phrasing for vario...Specifically, origctx, since d98ec36be808.
I tried running the tests, but I get a lot of unrelated diff ("1 new obsolescence markers" prints going away, a ton of "lines too long" errors in test-check-flake8, different phrasing for various things).https://foss.heptapod.net/mercurial/evolve/-/merge_requests/4docs: add example for the `prune` command2019-09-24T10:41:52ZRaphaël Gomèsdocs: add example for the `prune` commandGiving at least one example helps clear up the syntax, especially since most
options will follow a very similar pattern.Giving at least one example helps clear up the syntax, especially since most
options will follow a very similar pattern.