| Wed, 07 Nov 2018 15:45:09 -0800 |
Kyle Lippincott |
resolve: fix mark-check when a file was deleted on one side (issue6020)
|
file |
diff |
annotate
|
| Sat, 10 Nov 2018 12:07:26 +0900 |
Yuya Nishihara |
merge with stable
|
file |
diff |
annotate
|
| Wed, 07 Nov 2018 15:42:56 -0800 |
Kyle Lippincott |
tests: make the commands.resolve.confirm tests not pollute the test-wide hgrc
|
file |
diff |
annotate
|
| Wed, 07 Nov 2018 15:41:18 -0800 |
Kyle Lippincott |
tests: fix a couple typos in test-resolve.t comments and add a comment
|
file |
diff |
annotate
|
| Fri, 02 Nov 2018 11:57:45 -0700 |
Kyle Lippincott |
resolve: when resolve.mark-check=abort, downgrade to warning if pats specified
stable
|
file |
diff |
annotate
|
| Sun, 30 Sep 2018 15:15:27 +0900 |
Yuya Nishihara |
resolve: rename {status} to {mergestatus} to not shadow change status (BC)
|
file |
diff |
annotate
|
| Sat, 01 Sep 2018 18:00:38 -0400 |
Valentin Gatien-Baron |
resolve: test that we suggest a valid hg command
|
file |
diff |
annotate
|
| Sun, 26 Aug 2018 16:42:28 -0400 |
Valentin Gatien-Baron |
resolve: add config to make hg resolve not re-merge by default
|
file |
diff |
annotate
|
| Sun, 26 Aug 2018 15:52:34 -0400 |
Valentin Gatien-Baron |
resolve: add a flag for the default behavior of re-merging
|
file |
diff |
annotate
|
| Sat, 04 Aug 2018 12:43:41 +0530 |
Sushil khanchi |
resolve: support confirm config option with --unmark flag
|
file |
diff |
annotate
|
| Sun, 05 Aug 2018 00:53:55 -0700 |
Kyle Lippincott |
resolve: correct behavior of mark-check=none to match docs
|
file |
diff |
annotate
|
| Sat, 04 Aug 2018 12:23:18 +0530 |
Sushil khanchi |
resolve: support commands.resolve.confirm option with --mark flag
|
file |
diff |
annotate
|
| Fri, 03 Aug 2018 12:57:44 -0700 |
Kyle Lippincott |
resolve: graduate resolve.mark-check from experimental, add docs
|
file |
diff |
annotate
|
| Tue, 31 Jul 2018 19:11:17 +0530 |
Sushil khanchi |
resolve: add confirm config option
|
file |
diff |
annotate
|
| Thu, 26 Jul 2018 17:11:03 -0700 |
Kyle Lippincott |
resolve: add option to warn/abort on -m with unresolved conflict markers
|
file |
diff |
annotate
|
| Sun, 01 Jul 2018 22:11:23 +0900 |
Yuya Nishihara |
resolve: add support for log-like template keywords and functions
|
file |
diff |
annotate
|
| Sat, 03 Mar 2018 09:35:59 -0500 |
Augie Fackler |
tests: fix various test-check-module-imports.t violations
|
file |
diff |
annotate
|
| Wed, 28 Feb 2018 21:57:22 +0530 |
Pulkit Goyal |
py3: port the markdirver extension in tests/test-resolve.t
|
file |
diff |
annotate
|
| Mon, 08 Jan 2018 19:41:47 +0530 |
Pulkit Goyal |
merge: add `--abort` flag which can abort the merge
|
file |
diff |
annotate
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
file |
diff |
annotate
|
| Mon, 11 Sep 2017 17:49:49 +0000 |
Mark Thomas |
scmutil: don't append .orig to backups in origbackuppath (BC)
|
file |
diff |
annotate
|
| Sun, 25 Jun 2017 08:20:05 +0530 |
Pulkit Goyal |
py3: make sure commands name are bytes in tests
|
file |
diff |
annotate
|
| Sat, 09 Jan 2016 23:07:20 +0900 |
Yuya Nishihara |
registrar: move cmdutil.command to registrar module (API)
|
file |
diff |
annotate
|
| Fri, 07 Oct 2016 08:51:50 -0700 |
Simon Farnsworth |
merge: add conflict labels to merge command
|
file |
diff |
annotate
|
| Thu, 17 Mar 2016 14:50:29 +0000 |
timeless |
summary: move mergemod before parents to give access to ms
|
file |
diff |
annotate
|
| Thu, 24 Dec 2015 04:31:34 +0000 |
timeless |
resolve: when pats do not match, hint about path:
|
file |
diff |
annotate
|
| Fri, 05 Feb 2016 10:22:14 -0800 |
Durham Goode |
merge: add file ancestor linknode to mergestate
|
file |
diff |
annotate
|
| Mon, 07 Dec 2015 20:43:24 -0800 |
Martin von Zweigbergk |
merge: refuse update/merge if there are unresolved conflicts (BC)
|
file |
diff |
annotate
|
| Sun, 22 Nov 2015 21:20:08 -0500 |
Matt Harbison |
test-resolve: fix '--tool f' invocation for Windows
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 15:46:45 -0800 |
Siddharth Agarwal |
mergestate: handle additional record types specially
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 23:42:32 -0800 |
Siddharth Agarwal |
test-resolve.t: remove completely unnecessary line
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 20:59:17 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 17 Nov 2015 15:43:21 -0800 |
Siddharth Agarwal |
test-resolve.t: switch to mergestate.read()
|
file |
diff |
annotate
|
| Sun, 15 Nov 2015 21:12:13 -0500 |
Matt Harbison |
tests: fix globs for Windows
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 15:56:02 -0800 |
Siddharth Agarwal |
resolve: restore .orig only after merge is fully complete (issue4952)
stable
|
file |
diff |
annotate
|
| Tue, 10 Nov 2015 14:26:19 -0800 |
Christian Delahousse |
resolve: choose where .orig file locations are kept
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:15:22 -0700 |
Siddharth Agarwal |
commands.resolve: don't allow users to mark or unmark driver-resolved files
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 23:58:07 -0700 |
Siddharth Agarwal |
resolve: perform all premerges before performing any file merges (BC)
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 23:56:44 -0700 |
Siddharth Agarwal |
test-resolve.t: add some tests for .orig file contents
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 23:54:40 -0700 |
Siddharth Agarwal |
test-resolve.t: add some output to show order of operations
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Fri, 25 Sep 2015 03:51:46 -0400 |
timeless |
resolve: consistently describe re-merge + unresolved
|
file |
diff |
annotate
|
| Wed, 11 Feb 2015 13:59:13 +0900 |
Yuya Nishihara |
resolve: port to generic templater
|
file |
diff |
annotate
|
| Wed, 11 Feb 2015 13:47:43 +0900 |
Yuya Nishihara |
resolve: silence warning of unknown pats for -l/--list (BC)
|
file |
diff |
annotate
|
| Fri, 17 Oct 2014 11:01:05 -0400 |
Augie Fackler |
test-resolve.t: use redirection to /dev/null instead of grep -q
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 22:30:04 -0700 |
Martin von Zweigbergk |
resolve: run happily after conflict-free merge
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 22:16:18 -0700 |
Martin von Zweigbergk |
test-resolve: add tests for re-merge
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 22:19:08 -0700 |
Martin von Zweigbergk |
test-resolve: add more tests for in conflict-free states
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 21:07:30 -0700 |
Martin von Zweigbergk |
test-resolve: add test resolving one of two files
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 21:19:31 -0700 |
Martin von Zweigbergk |
test-resolve: clarify test descriptions and consistently use "should"
|
file |
diff |
annotate
|
| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
file |
diff |
annotate
|
| Mon, 09 Jun 2014 14:11:17 -0500 |
Matt Mackall |
resolve: fix grammar of no matching files message
|
file |
diff |
annotate
|
| Fri, 23 May 2014 13:10:31 -0700 |
Siddharth Agarwal |
resolve: don't abort resolve -l even when no merge is in progress
|
file |
diff |
annotate
|
| Fri, 09 May 2014 14:46:50 -0500 |
Matt Mackall |
resolve: simplify "finished" message
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 18:56:26 -0700 |
Gregory Szorc |
resolve: print warning when no work performed (issue4208)
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 19:08:32 -0700 |
Gregory Szorc |
resolve: abort when not applicable (BC)
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 18:26:42 -0700 |
Gregory Szorc |
resolve: split test
|
file |
diff |
annotate
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
file |
diff |
annotate
|
| Tue, 19 Oct 2010 22:33:52 -0500 |
Steve Borho |
merge: implement --tool arguments using new ui.forcemerge configurable
|
file |
diff |
annotate
|