Mercurial > hg

log tests/test-histedit-non-commute-abort.t @ 48326:141e38ef8d8f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Tue, 28 Sep 2021 09:32:24 -0700 Martin von Zweigbergk histedit: use more specific exceptions for more detailed exit codes
Wed, 10 Mar 2021 13:14:32 +0530 Pulkit Goyal commit: get info from mergestate whether a file was merged or not
Thu, 13 Feb 2020 21:14:20 -0800 Martin von Zweigbergk debugmergestate: make templated
Wed, 25 Sep 2019 13:50:48 -0400 Augie Fackler histedit: sniff-test for untracked file conflicts before prompting for rules
Mon, 23 Sep 2019 16:29:16 -0400 Augie Fackler histedit: demonstrate breakage when `update` to a revision breaks
Sat, 19 Mar 2016 18:37:10 -0700 Simon Farnsworth merge: save merge part labels for later reuse
Fri, 05 Feb 2016 10:22:14 -0800 Durham Goode merge: add file ancestor linknode to mergestate
Wed, 03 Feb 2016 13:52:04 +0000 timeless histedit: limit updated and merging output to important updates
Wed, 23 Dec 2015 08:57:04 +0000 timeless histedit: list action when intervention is required
Mon, 14 Dec 2015 21:43:16 +0000 timeless histedit: omit useless message from update (histeditaction)
Mon, 30 Nov 2015 10:26:37 -0800 Siddharth Agarwal debugmergestate: print out null nodes as 'null'
Wed, 18 Nov 2015 15:46:45 -0800 Siddharth Agarwal mergestate: handle additional record types specially
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Sun, 05 Apr 2015 11:55:38 -0700 Durham Goode graft: allow creating sibling grafts
Fri, 23 May 2014 13:10:31 -0700 Siddharth Agarwal resolve: don't abort resolve -l even when no merge is in progress
Fri, 18 Apr 2014 19:08:32 -0700 Gregory Szorc resolve: abort when not applicable (BC)
Fri, 22 Nov 2013 19:14:17 +0100 Martin Geisler tests: don't load unnecessary graphlog extension
Tue, 16 Apr 2013 21:57:25 -0500 Pierre-Yves David histedit-test: generalise --commands "-" usage
Fri, 08 Feb 2013 16:27:49 -0600 Augie Fackler histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Fri, 21 Sep 2012 19:27:22 +0200 Pierre-Yves David histedit: replaces patching logic by merges
Mon, 02 Jul 2012 01:47:59 +0200 Mads Kiilerich tests: make histedit pass on Windows MSYS
Sat, 30 Jun 2012 03:34:50 +0200 Mads Kiilerich tests: make histedit tests more resilient to filesystem variation
Sat, 30 Jun 2012 03:34:44 +0200 Mads Kiilerich tests: convert histedit tests to .t base tests/test-histedit-non-commute-abort@bd267de8fc4c
less more | (0) tip