| 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
|
| Wed, 03 Jun 2015 14:21:15 -0400 |
Matt Harbison |
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
|
file |
diff |
annotate
|
| Fri, 29 May 2015 22:23:58 +0200 |
Gilles Moris |
summary: move the parents phase marker to commit line (issue4688)
|
file |
diff |
annotate
|
| Wed, 27 May 2015 06:08:14 -0700 |
Pierre-Yves David |
subrepo: detect issue3781 case earlier so it apply to bundle2
|
file |
diff |
annotate
|
| Sat, 09 May 2015 23:40:40 -0700 |
Pierre-Yves David |
progress: get the extremely verbose output out of default debug
|
file |
diff |
annotate
|
| Thu, 14 May 2015 17:38:38 +0200 |
Gilles Moris |
summary: add a phase line (draft, secret) to the output
|
file |
diff |
annotate
|