Mercurial > hg

log tests/test-resolve.t @ 47234:616b8f412676

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -60 tip
age author description
Wed, 10 Mar 2021 13:14:32 +0530 Pulkit Goyal commit: get info from mergestate whether a file was merged or not
Fri, 29 Jan 2021 15:56:08 -0800 Martin von Zweigbergk errors: use StateError more in merge module
Tue, 19 Jan 2021 14:00:42 -0800 Martin von Zweigbergk resolve: also detect new :mergediff conflict markers
Thu, 22 Oct 2020 14:14:59 -0700 Martin von Zweigbergk errors: introduce CanceledError and use it in a few places
Mon, 12 Oct 2020 12:44:18 -0700 Martin von Zweigbergk errors: introduce StateError and use it from commands and cmdutil
Tue, 06 Oct 2020 22:36:15 -0700 Martin von Zweigbergk errors: introduce InputError and use it from commands and cmdutil
Wed, 21 Oct 2020 19:00:16 -0700 Martin von Zweigbergk errors: add config that lets user get more detailed exit codes
Thu, 17 Sep 2020 22:34:36 -0700 Martin von Zweigbergk mergedriver: delete it
Mon, 24 Aug 2020 18:59:19 +0530 Pulkit Goyal debugmergestate: show extras for files which are not in mergestate
Mon, 13 Jul 2020 16:42:44 -0700 Daniel Ploch error: unify the error message formats for 'rebase' and 'unshelve'
Mon, 18 May 2020 14:59:59 -0400 Augie Fackler mergestate: split out merge state handling code from main merge module
Thu, 13 Feb 2020 21:14:20 -0800 Martin von Zweigbergk debugmergestate: make templated
Wed, 21 Aug 2019 13:14:39 -0700 Martin von Zweigbergk merge: hint about using `hg resolve` for resolving conflicts
Thu, 20 Jun 2019 11:40:47 -0700 Kyle Lippincott filemerge: make last line of prompts <40 english chars (issue6158)
Tue, 29 Jan 2019 12:01:13 -0800 Martin von Zweigbergk resolve: respect ui.relative-paths
Wed, 07 Nov 2018 15:45:09 -0800 Kyle Lippincott resolve: fix mark-check when a file was deleted on one side (issue6020)
Sat, 10 Nov 2018 12:07:26 +0900 Yuya Nishihara merge with stable
Wed, 07 Nov 2018 15:42:56 -0800 Kyle Lippincott tests: make the commands.resolve.confirm tests not pollute the test-wide hgrc
Wed, 07 Nov 2018 15:41:18 -0800 Kyle Lippincott tests: fix a couple typos in test-resolve.t comments and add a comment
Fri, 02 Nov 2018 11:57:45 -0700 Kyle Lippincott resolve: when resolve.mark-check=abort, downgrade to warning if pats specified stable
Sun, 30 Sep 2018 15:15:27 +0900 Yuya Nishihara resolve: rename {status} to {mergestatus} to not shadow change status (BC)
Sat, 01 Sep 2018 18:00:38 -0400 Valentin Gatien-Baron resolve: test that we suggest a valid hg command
Sun, 26 Aug 2018 16:42:28 -0400 Valentin Gatien-Baron resolve: add config to make hg resolve not re-merge by default
Sun, 26 Aug 2018 15:52:34 -0400 Valentin Gatien-Baron resolve: add a flag for the default behavior of re-merging
Sat, 04 Aug 2018 12:43:41 +0530 Sushil khanchi resolve: support confirm config option with --unmark flag
Sun, 05 Aug 2018 00:53:55 -0700 Kyle Lippincott resolve: correct behavior of mark-check=none to match docs
Sat, 04 Aug 2018 12:23:18 +0530 Sushil khanchi resolve: support commands.resolve.confirm option with --mark flag
Fri, 03 Aug 2018 12:57:44 -0700 Kyle Lippincott resolve: graduate resolve.mark-check from experimental, add docs
Tue, 31 Jul 2018 19:11:17 +0530 Sushil khanchi resolve: add confirm config option
Thu, 26 Jul 2018 17:11:03 -0700 Kyle Lippincott resolve: add option to warn/abort on -m with unresolved conflict markers
Sun, 01 Jul 2018 22:11:23 +0900 Yuya Nishihara resolve: add support for log-like template keywords and functions
Sat, 03 Mar 2018 09:35:59 -0500 Augie Fackler tests: fix various test-check-module-imports.t violations
Wed, 28 Feb 2018 21:57:22 +0530 Pulkit Goyal py3: port the markdirver extension in tests/test-resolve.t
Mon, 08 Jan 2018 19:41:47 +0530 Pulkit Goyal merge: add `--abort` flag which can abort the merge
Sun, 10 Dec 2017 22:50:57 -0500 Matt Harbison tests: remove (glob) annotations that were only for '\' matches
Mon, 11 Sep 2017 17:49:49 +0000 Mark Thomas scmutil: don't append .orig to backups in origbackuppath (BC)
Sun, 25 Jun 2017 08:20:05 +0530 Pulkit Goyal py3: make sure commands name are bytes in tests
Sat, 09 Jan 2016 23:07:20 +0900 Yuya Nishihara registrar: move cmdutil.command to registrar module (API)
Fri, 07 Oct 2016 08:51:50 -0700 Simon Farnsworth merge: add conflict labels to merge command
Thu, 17 Mar 2016 14:50:29 +0000 timeless summary: move mergemod before parents to give access to ms
Thu, 24 Dec 2015 04:31:34 +0000 timeless resolve: when pats do not match, hint about path:
Fri, 05 Feb 2016 10:22:14 -0800 Durham Goode merge: add file ancestor linknode to mergestate
Mon, 07 Dec 2015 20:43:24 -0800 Martin von Zweigbergk merge: refuse update/merge if there are unresolved conflicts (BC)
Sun, 22 Nov 2015 21:20:08 -0500 Matt Harbison test-resolve: fix '--tool f' invocation for Windows
Wed, 18 Nov 2015 15:46:45 -0800 Siddharth Agarwal mergestate: handle additional record types specially
Wed, 18 Nov 2015 23:42:32 -0800 Siddharth Agarwal test-resolve.t: remove completely unnecessary line
Wed, 18 Nov 2015 20:59:17 -0600 Matt Mackall merge with stable
Tue, 17 Nov 2015 15:43:21 -0800 Siddharth Agarwal test-resolve.t: switch to mergestate.read()
Sun, 15 Nov 2015 21:12:13 -0500 Matt Harbison tests: fix globs for Windows
Fri, 13 Nov 2015 15:56:02 -0800 Siddharth Agarwal resolve: restore .orig only after merge is fully complete (issue4952) stable
Tue, 10 Nov 2015 14:26:19 -0800 Christian Delahousse resolve: choose where .orig file locations are kept
Thu, 15 Oct 2015 01:15:22 -0700 Siddharth Agarwal commands.resolve: don't allow users to mark or unmark driver-resolved files
Sun, 11 Oct 2015 23:58:07 -0700 Siddharth Agarwal resolve: perform all premerges before performing any file merges (BC)
Sun, 11 Oct 2015 23:56:44 -0700 Siddharth Agarwal test-resolve.t: add some tests for .orig file contents
Sun, 11 Oct 2015 23:54:40 -0700 Siddharth Agarwal test-resolve.t: add some output to show order of operations
Fri, 09 Oct 2015 13:54:52 -0700 Siddharth Agarwal simplemerge: move conflict warning message to filemerge
Fri, 25 Sep 2015 03:51:46 -0400 timeless resolve: consistently describe re-merge + unresolved
Wed, 11 Feb 2015 13:59:13 +0900 Yuya Nishihara resolve: port to generic templater
Wed, 11 Feb 2015 13:47:43 +0900 Yuya Nishihara resolve: silence warning of unknown pats for -l/--list (BC)
Fri, 17 Oct 2014 11:01:05 -0400 Augie Fackler test-resolve.t: use redirection to /dev/null instead of grep -q
less more | (0) -60 tip