log tests/test-evolve-content-divergent-relocation.t @ 5318:88f9bbba392d mercurial-4.6

age author description
Fri, 08 May 2020 22:50:09 +0800 Anton Shestakov test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Fri, 08 May 2020 22:18:15 +0800 Anton Shestakov test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
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, 07 May 2020 07:57:14 -0700 Martin von Zweigbergk evolve: mark new hash-salting extras keys as uninteresting for effect flag
Mon, 09 Dec 2019 11:09:11 -0800 Martin von Zweigbergk evolve: handle relocation during divergence resolution producing no changes
Mon, 09 Dec 2019 10:05:24 -0800 Martin von Zweigbergk tests: show crash from divergence resolution resulting in empty commit
Thu, 30 Apr 2020 10:05:14 -0700 Martin von Zweigbergk evolve: always create commit when resolving divergence
Fri, 01 May 2020 07:44:01 -0700 Martin von Zweigbergk tests: avoid referring to commits by hash in a few places
Fri, 01 May 2020 07:43:15 -0700 Martin von Zweigbergk tests: add more verification of output to divergence tests
Mon, 16 Dec 2019 11:14:39 -0800 Martin von Zweigbergk tests: add debugobsolete calls before many obslog calls
Sat, 29 Feb 2020 15:18:00 +0700 Anton Shestakov test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Tue, 14 Jan 2020 20:20:13 +0700 Anton Shestakov obslog: use _successorsetverb() in regular obslog too
Mon, 29 Jul 2019 14:43:17 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
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
Fri, 26 Apr 2019 01:20:08 +0530 Sushil khanchi evolve: move status msg to verbose mode in content-divergence resolution
Wed, 24 Apr 2019 15:59:02 +0200 Anton Shestakov evolve: don't update after instability resolution by default (BC)
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 base tests/test-evolve-content-divergence.t@52bb5b1b3224
Wed, 10 Apr 2019 16:59:28 +0200 Pierre-Yves David branching: merge with test consolidation base tests/test-evolve-content-divergence.t@37af88986be5
Wed, 10 Apr 2019 14:32:00 +0200 Pierre-Yves David test: consolidate the content-divergent test cases stable base tests/test-evolve-content-divergence.t@98e4858881ed