| Fri, 03 Dec 2021 21:41:43 -0800 |
Martin von Zweigbergk |
filemerge: make `_filemerge()` do both premerge and merge
|
file |
diff |
annotate
|
| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
file |
diff |
annotate
|
| Fri, 19 Nov 2021 03:04:42 +0100 |
Pierre-Yves David |
dirstate: remove need_delay logic
|
file |
diff |
annotate
|
| Thu, 28 Oct 2021 17:26:03 +0200 |
Pierre-Yves David |
dirstate: use a single closure for get_flags
|
file |
diff |
annotate
|
| Mon, 07 Dec 2020 20:32:05 -0500 |
Matt Harbison |
tests: correct the output order about starting a background thread for Windows
|
file |
diff |
annotate
|
| Mon, 23 Nov 2020 12:42:57 -0800 |
Martin von Zweigbergk |
errors: remove trailing "!" in messages about creating new heads on push
|
file |
diff |
annotate
|
| Mon, 23 Nov 2020 11:18:48 -0800 |
Martin von Zweigbergk |
errors: remove trailing "!" from some error messages for consistency
|
file |
diff |
annotate
|
| Fri, 10 Apr 2020 19:58:34 +0200 |
Joerg Sonnenberger |
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:48:39 -0400 |
Augie Fackler |
formatting: byteify all mercurial/ and hgext/ string literals
|
file |
diff |
annotate
|
| Fri, 12 Jul 2019 19:38:18 -0400 |
Matt Harbison |
tests: properly position conditional output on Windows in test-subrepo.t
|
file |
diff |
annotate
|
| Mon, 24 Jun 2019 16:01:01 -0700 |
Kyle Lippincott |
subrepos: make last line of prompts <40 english chars (issue6158)
|
file |
diff |
annotate
|
| Thu, 11 Apr 2019 23:28:38 -0700 |
Martin von Zweigbergk |
copies: delete debug message about search limit
|
file |
diff |
annotate
|
| Thu, 21 Mar 2019 21:40:22 -0400 |
Matt Harbison |
diff: support diffing explicit files in subrepos
|
file |
diff |
annotate
|
| Thu, 14 Mar 2019 00:40:11 +0000 |
Pierre-Yves David |
manifestcache: use `wcache` directory for manifest cache
|
file |
diff |
annotate
|
| Sun, 17 Feb 2019 09:12:30 -0800 |
Martin von Zweigbergk |
subrepo: use root-repo-relative path from `hg files` with ui.relative-paths=no
|
file |
diff |
annotate
|
| Sun, 17 Feb 2019 09:05:28 -0800 |
Martin von Zweigbergk |
subrepo: demonstrate broken `hg files` with ui.relative-paths=no
|
file |
diff |
annotate
|
| Tue, 04 Dec 2018 00:16:12 -0500 |
Matt Harbison |
tests: stabilize for recent wcache changes
|
file |
diff |
annotate
|
| Thu, 15 Nov 2018 02:46:31 +0100 |
Boris Feld |
cache: create `wcache` directory at init time
|
file |
diff |
annotate
|
| Thu, 15 Nov 2018 17:08:23 +0100 |
Boris Feld |
check-exec: write file in 'wcache' instead of 'cache'
|
file |
diff |
annotate
|
| Fri, 16 Nov 2018 18:37:26 -0500 |
Matt Harbison |
subrepo: print the status line before creating the peer for better diagnostics
stable
|
file |
diff |
annotate
|
| Sun, 05 Aug 2018 16:44:16 +0900 |
Yuya Nishihara |
formatter: rename {abspath}/{file} to {path}, and drop relative {path} (BC)
|
file |
diff |
annotate
|
| Tue, 19 Jun 2018 22:45:52 +0900 |
Yuya Nishihara |
merge: do not fill manifest of committed revision with pseudo node (issue5526)
stable
|
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
|
| Sat, 25 Nov 2017 15:29:34 +0900 |
Yuya Nishihara |
cat: record the current behavior of wildcard matches in subrepos
stable
|
file |
diff |
annotate
|
| Mon, 06 Nov 2017 22:32:41 -0800 |
Gregory Szorc |
subrepo: use per-type config options to enable subrepos
stable
|
file |
diff |
annotate
|
| Sun, 05 Nov 2017 21:48:58 +0900 |
Yuya Nishihara |
subrepo: extend config option to disable subrepos by type (SEC)
stable
|
file |
diff |
annotate
|
| Sun, 05 Nov 2017 21:22:07 +0900 |
Yuya Nishihara |
subrepo: add config option to reject any subrepo operations (SEC)
stable
|
file |
diff |
annotate
|
| Sun, 15 Oct 2017 22:48:02 -0400 |
Matt Harbison |
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
|
file |
diff |
annotate
|
| Thu, 12 Oct 2017 09:39:50 +0200 |
Denis Laxalde |
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
|
file |
diff |
annotate
|
| Mon, 07 Aug 2017 22:22:28 +0900 |
Yuya Nishihara |
ssh: unban the use of pipe character in user@host:port string
stable 4.3.1
|
file |
diff |
annotate
|
| Mon, 31 Jul 2017 16:04:44 -0700 |
Sean Farley |
subrepo: add tests for hg rogue ssh urls (SEC)
stable
|
file |
diff |
annotate
|
| Mon, 07 Aug 2017 22:22:28 +0900 |
Yuya Nishihara |
ssh: unban the use of pipe character in user@host:port string
stable 4.2.3
|
file |
diff |
annotate
|
| Mon, 31 Jul 2017 16:04:44 -0700 |
Sean Farley |
subrepo: add tests for hg rogue ssh urls (SEC)
stable
|
file |
diff |
annotate
|
| Sun, 09 Jul 2017 16:13:30 -0400 |
Matt Harbison |
subrepo: make the output references to subrepositories consistent
|
file |
diff |
annotate
|
| Tue, 06 Jun 2017 22:17:39 +0530 |
Pulkit Goyal |
update: show the commit to which we updated in case of multiple heads (BC)
|
file |
diff |
annotate
|
| Sun, 04 Jun 2017 20:11:59 -0400 |
Matt Harbison |
tests: adjust recent output changes for Windows
|
file |
diff |
annotate
|
| Thu, 25 May 2017 21:53:44 +0900 |
Yuya Nishihara |
cat: add formatter support
|
file |
diff |
annotate
|
| Sun, 02 Apr 2017 02:24:09 -0400 |
Matt Harbison |
test-subrepo: update output for Windows
|
file |
diff |
annotate
|
| Mon, 20 Mar 2017 04:36:55 -0700 |
Simon Farnsworth |
subrepo: move prompts out of the if (issue5505)
stable
|
file |
diff |
annotate
|
| Sun, 08 Jan 2017 13:49:53 -0500 |
Matt Harbison |
tests: update globs for Windows
|
file |
diff |
annotate
|
| Wed, 30 Nov 2016 19:25:18 +0000 |
Jun Wu |
tests: replace "cp -r" with "cp -R"
|
file |
diff |
annotate
|
| Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
file |
diff |
annotate
|
| Fri, 07 Oct 2016 08:51:50 -0700 |
Simon Farnsworth |
merge: add conflict labels to merge command
|
file |
diff |
annotate
|
| Sat, 08 Oct 2016 01:25:28 -0700 |
Simon Farnsworth |
merge: use labels in subrepo merge
|
file |
diff |
annotate
|
| Tue, 20 Sep 2016 23:47:30 +0000 |
timeless |
discovery: use single quotes in use warning
|
file |
diff |
annotate
|
| Wed, 03 Aug 2016 15:52:11 +0200 |
Pierre-Yves David |
tests: remove all remaining usage of experimental.bundle2-exp
|
file |
diff |
annotate
|
| Wed, 03 Aug 2016 15:39:55 +0200 |
Pierre-Yves David |
tests: use 'legacy.exchange' option in various mixed tests
|
file |
diff |
annotate
|
| Wed, 27 Jul 2016 08:38:54 +0000 |
Hannes Oldenburg |
cmdutil: warnings not issued in cat if subrepopath overlaps
stable
|
file |
diff |
annotate
|
| Fri, 22 Jul 2016 11:29:42 +0000 |
Hannes Oldenburg |
cmdutil: warnings not issued in remove if subrepopath overlaps
stable
|
file |
diff |
annotate
|
| Mon, 29 Feb 2016 01:01:20 -0500 |
Matt Harbison |
tests: flag Windows specific lines about background closing as optional
|
file |
diff |
annotate
|
| Tue, 02 Feb 2016 14:49:02 +0000 |
Pierre-Yves David |
update: warn about other topological heads on bare update
|
file |
diff |
annotate
|
| Fri, 15 Jan 2016 13:46:33 -0800 |
Ruslan Sayfutdinov |
backout: commit changeset by default (BC)
|
file |
diff |
annotate
|
| Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 12:55:45 -0700 |
Pierre-Yves David |
error: get Abort from 'error' instead of 'util'
|
file |
diff |
annotate
|
| Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
file |
diff |
annotate
|
| Wed, 08 Jul 2015 17:01:09 +0900 |
FUJIWARA Katsunori |
context: write dirstate out explicitly after marking files as clean
|
file |
diff |
annotate
|