log tests/test-evolve-issue5958.t @ 5739:b45e7847f75e stable

age author description
Sun, 20 Sep 2020 09:22:04 +0530 Sushil khanchi evolve: remove swapping nodes logic while resolving divergence
Tue, 28 Jul 2020 14:26:44 +0530 Sushil khanchi evolve: add more testing for parent-child form content-div
Sun, 26 Jul 2020 01:02:22 +0530 Sushil khanchi evolve: fix content-div resolution when in parent-child form
Sun, 26 Jul 2020 00:35:52 +0530 Sushil khanchi tests: add a log -G to demonstrate a fix in next patch
Thu, 07 May 2020 01:29:48 +0200 Anton Shestakov obslog: makes --origin flag the default
Fri, 08 May 2020 04:02:22 +0200 Pierre-Yves David evolve: rename `evolve_source_*` to `divergence_source_*`
Thu, 30 Apr 2020 10:05:14 -0700 Martin von Zweigbergk evolve: always create commit when resolving divergence
Mon, 16 Dec 2019 11:14:39 -0800 Martin von Zweigbergk tests: add debugobsolete calls before many obslog calls
Tue, 14 Jan 2020 20:20:13 +0700 Anton Shestakov obslog: use _successorsetverb() in regular obslog too
Thu, 23 Jan 2020 17:40:59 +0700 Anton Shestakov test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Fri, 13 Dec 2019 01:29:27 +0530 Sushil khanchi evolve: move a test where it makes more sense
Fri, 11 Oct 2019 21:32:27 +0200 Manuel Jacob evolve: preserve date when resolving content-divergence (issue6202) stable
Tue, 10 Dec 2019 19:58:51 +0100 Pierre-Yves David test: add test for content divergence involving a date update stable
Tue, 10 Dec 2019 19:55:37 +0100 Pierre-Yves David test: add test for content divergence involving a date update stable
Tue, 10 Dec 2019 19:27:55 +0100 Pierre-Yves David test: add test for content divergence involving a date update stable
Tue, 10 Dec 2019 19:13:06 +0100 Pierre-Yves David test: highlight data handling when solving divergence stable
Mon, 09 Sep 2019 09:28:47 +0700 Anton Shestakov evolve: check that relocating makes sense in _solvedivergent() (issue5958) stable
Wed, 24 Oct 2018 19:32:04 +0200 Pierre-Yves David tests: demonstrate content divergence causing "relocate node on top of itself" stable