Mercurial > evolve

log tests/test-evolve-content-divergent-stack.t @ 6850:6d22e9a596c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Fri, 07 Oct 2022 20:32:14 -0400 Matt Harbison evolve: stop preserving all of {extras} for uninterrupted evolve operations
Fri, 07 Oct 2022 18:14:58 -0400 Matt Harbison evolve: don't embed graft data when completing interrupted evolve operations
Tue, 12 Oct 2021 14:04:23 +0300 Anton Shestakov test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Tue, 12 Oct 2021 11:32:36 +0300 Anton Shestakov test-compat: merge mercurial-5.7 into mercurial-5.6 mercurial-5.6
Thu, 17 Jun 2021 11:18:30 +0300 Anton Shestakov tests: spell out hg resolve
Thu, 17 Jun 2021 11:08:01 +0300 Anton Shestakov tests: spell out hg commands for readability
Thu, 11 Mar 2021 14:48:12 +0800 Anton Shestakov test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Thu, 11 Mar 2021 12:29:50 +0800 Anton Shestakov test-compat: merge stable into mercurial-5.6 mercurial-5.6
Wed, 26 Aug 2020 23:27:17 +0530 Sushil khanchi evolve: preserve wdir when using --stop
Sun, 31 Jan 2021 16:15:26 +0800 Anton Shestakov test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Thu, 28 Jan 2021 18:48:36 +0800 Anton Shestakov tests: back out changeset b3d9e6c805d6 mercurial-5.6
Fri, 22 Jan 2021 11:04:55 +0100 Pierre-Yves David branching: merge stable into default
Thu, 19 Nov 2020 08:28:45 -0800 Martin von Zweigbergk tests: update with more detailed exit codes stable
Tue, 24 Nov 2020 18:04:40 -0800 Martin von Zweigbergk evolve: remove spurious "working directory is now at ..." messages stable
Thu, 19 Nov 2020 08:28:45 -0800 Martin von Zweigbergk tests: update with more detailed exit codes
Sat, 31 Oct 2020 20:02:03 +0800 Anton Shestakov test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Fri, 21 Aug 2020 18:05:37 +0530 Sushil khanchi evolve: remove trailing white spaces
Fri, 21 Aug 2020 18:04:48 +0530 Sushil khanchi evolve: refactor some error raising logic in content-divergence
Sun, 20 Sep 2020 09:22:04 +0530 Sushil khanchi evolve: remove swapping nodes logic while resolving divergence
Mon, 31 Aug 2020 01:10:58 +0530 Sushil khanchi evolve: make sure we don't miss merging content of divergent changesets
Wed, 05 Aug 2020 00:16:26 +0530 Sushil khanchi evolve: add test to show broken --continue case of content divergence
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
Thu, 30 Apr 2020 10:05:14 -0700 Martin von Zweigbergk evolve: always create commit when resolving divergence
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
Thu, 23 Jan 2020 17:40:57 +0700 Anton Shestakov test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Thu, 28 Nov 2019 19:01:28 +0530 Sushil khanchi evolve: add logic to cover --stop when "divergent" relocation in play
Thu, 28 Nov 2019 17:58:45 +0530 Sushil khanchi evolve: test to show that --stop is not working when "divergent" relocated
Wed, 27 Nov 2019 22:52:08 +0530 Sushil khanchi evolve: add test to show that --abort is working fine
Wed, 27 Nov 2019 20:54:48 +0530 Sushil khanchi evolve: add more tests for --continue case when relocating "divergent"
Wed, 27 Nov 2019 12:34:19 +0530 Sushil khanchi evolve: add logic to cover --continue case when relocating "divergent"
Mon, 25 Nov 2019 21:28:52 +0530 Sushil khanchi evolve: add test for `--continue` case when relocating "divergent"
Sat, 07 Dec 2019 03:27:50 +0530 Sushil khanchi evolve: add tests for the case when resolution parent is ambiguous stable
Sat, 23 Nov 2019 16:17:04 +0530 Sushil khanchi evolve: make sure divergence resolution doesn't undo changes (issue6203) stable
Sat, 23 Nov 2019 20:25:16 +0530 Sushil khanchi evolve: add test to demonstrate issue6203 stable
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:42:50 +0200 Pierre-Yves David test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Fri, 26 Apr 2019 01:20:08 +0530 Sushil khanchi evolve: move status msg to verbose mode in content-divergence resolution
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)
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: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
less more | (0) tip