log tests/test-evolve-phase-divergence.t @ 5498:f5d44464d72e

age author description
Thu, 07 May 2020 01:29:48 +0200 Anton Shestakov obslog: makes --origin flag the default
Mon, 16 Dec 2019 11:14:39 -0800 Martin von Zweigbergk tests: add debugobsolete calls before many obslog calls
Wed, 15 Apr 2020 21:52:29 +0800 Anton Shestakov tests: update output to match 1b8fd4af3318 in core
Sat, 29 Feb 2020 15:18:00 +0700 Anton Shestakov test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Sat, 29 Feb 2020 15:17:31 +0700 Anton Shestakov test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Tue, 14 Jan 2020 20:20:13 +0700 Anton Shestakov obslog: use _successorsetverb() in regular obslog too
Fri, 27 Sep 2019 13:03:20 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Fri, 27 Sep 2019 13:03:18 +0200 Pierre-Yves David test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Fri, 30 Aug 2019 11:31:19 +0700 Anton Shestakov obslog: only indent the first chunk and chunks just after newlines (issue6175) stable
Fri, 30 Aug 2019 11:28:02 +0700 Anton Shestakov tests: demonstrate too many spaces in olog -p output with word-diff stable
Mon, 29 Jul 2019 14:43:17 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Mon, 29 Jul 2019 14:43:15 +0200 Pierre-Yves David test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Thu, 06 Jun 2019 17:37:42 +0800 Anton Shestakov evolvecmd: the proper way to deal with conflicts is to resolve them
Wed, 05 Jun 2019 17:56:44 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Wed, 05 Jun 2019 17:45:45 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Wed, 05 Jun 2019 17:42:50 +0200 Pierre-Yves David test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Fri, 19 Apr 2019 09:41:39 -0700 Martin von Zweigbergk evolve: run in a single transaction
Wed, 24 Apr 2019 15:59:02 +0200 Anton Shestakov evolve: don't update after instability resolution by default (BC)
Sun, 14 Apr 2019 02:18:19 +0800 Anton Shestakov tests: add --update to hg evolve to reduce test changes for the next patch
Tue, 23 Apr 2019 12:28:32 +0200 Pierre-Yves David test-compat: adapt test output to 4.4 mercurial-4.4
Thu, 11 Apr 2019 22:44:53 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Thu, 11 Apr 2019 22:42:13 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Thu, 11 Apr 2019 22:41:41 +0200 Pierre-Yves David test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Wed, 10 Apr 2019 21:03:56 +0200 Pierre-Yves David test: add file cancelation scenario for phase-divergence
Wed, 10 Apr 2019 20:43:42 +0200 Pierre-Yves David test: introduce a more complete test for phase-divergence
Wed, 10 Apr 2019 20:18:14 +0200 Pierre-Yves David test: cleanup title and doc phase-divergent cases
Wed, 10 Apr 2019 16:40:58 +0200 Pierre-Yves David branching: merge with stable
Tue, 09 Apr 2019 20:45:36 +0200 Pierre-Yves David extensions: avoid enabling evolve for unrelated repositories (issue6057) stable
Thu, 28 Mar 2019 15:05:57 -0700 Martin von Zweigbergk tests: add obslog output to some tests for divergence resolution
Thu, 28 Mar 2019 14:54:46 -0700 Martin von Zweigbergk tests: add tests for divergence resolution with split+amend