Mercurial > evolve

log tests/test-evolve-public-content-divergent-discard.t @ 5834:c2484b0217ee mercurial-4.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
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
Wed, 28 Oct 2020 20:24:26 +0100 Pierre-Yves David branching: merge stable into default
Sat, 19 Sep 2020 17:49:31 +0200 Anton Shestakov evolve: clean merge state when content divergence resolution has no changes stable
Thu, 13 Aug 2020 18:10:51 +0530 Sushil khanchi evolve: handle preparation logic for public divergence in one block
Thu, 17 Sep 2020 20:05:39 +0200 Pierre-Yves David test: adjust output to current stable stable
Mon, 04 Nov 2019 01:30:50 +0530 Sushil khanchi evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
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
Tue, 04 Jun 2019 11:08:44 +0200 Pierre-Yves David branching: merge with stable base tests/test-evolve-public-content-divergent.t@fa4093f7ff5c
Fri, 26 Apr 2019 01:20:08 +0530 Sushil khanchi evolve: move status msg to verbose mode in content-divergence resolution
Sat, 27 Apr 2019 22:45:16 -0400 Matt Harbison templatekw: add `instabilities` alias for `troubles`
Sat, 09 Mar 2019 19:35:45 +0530 Sushil khanchi evolve: warn user for the metadata being lost in public divergence resolution
Wed, 17 Apr 2019 21:16:17 +0530 Sushil khanchi evolve: show a status message when merging leads to public cset
Wed, 24 Apr 2019 20:32:01 +0200 Pierre-Yves David test: use a shorter test name base tests/test-evolve-public-content-divergent-mergingleadstopublic.t@b3099e8796bc
less more | (0) tip