| Wed, 25 Nov 2015 14:25:26 -0800 |
Siddharth Agarwal |
filemerge: add debug output for whether this is a change/delete conflict
|
| Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
| Thu, 08 Oct 2015 12:55:45 -0700 |
Pierre-Yves David |
error: get Abort from 'error' instead of 'util'
|
| Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
| Wed, 08 Jul 2015 17:01:09 +0900 |
FUJIWARA Katsunori |
context: write dirstate out explicitly after marking files as clean
|
| Wed, 03 Jun 2015 14:21:15 -0400 |
Matt Harbison |
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
|
| Fri, 29 May 2015 22:23:58 +0200 |
Gilles Moris |
summary: move the parents phase marker to commit line (issue4688)
|
| Wed, 27 May 2015 06:08:14 -0700 |
Pierre-Yves David |
subrepo: detect issue3781 case earlier so it apply to bundle2
|
| Sat, 09 May 2015 23:40:40 -0700 |
Pierre-Yves David |
progress: get the extremely verbose output out of default debug
|
| Thu, 14 May 2015 17:38:38 +0200 |
Gilles Moris |
summary: add a phase line (draft, secret) to the output
|
| Mon, 27 Apr 2015 21:34:23 -0400 |
Matt Harbison |
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
stable
|
| Mon, 27 Apr 2015 21:15:25 -0400 |
Matt Harbison |
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
stable
|
| Fri, 24 Apr 2015 23:23:55 -0400 |
Matt Harbison |
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
stable
|
| Wed, 25 Mar 2015 13:55:35 +0900 |
FUJIWARA Katsunori |
subrepo: add bailifchanged to centralize raising Abort if subrepo is dirty
|
| Wed, 25 Mar 2015 13:55:32 +0900 |
FUJIWARA Katsunori |
subrepo: add dirtyreason to centralize composing dirty reason message
|
| Wed, 18 Mar 2015 23:03:41 -0400 |
Matt Harbison |
subrepo: add basic support to hgsubrepo for the files command
|
| Fri, 27 Feb 2015 17:46:03 -0600 |
Matt Mackall |
merge with stable
|
| Sat, 07 Feb 2015 21:47:28 -0500 |
Matt Harbison |
revert: display full subrepo output with --dry-run
|
| Tue, 17 Feb 2015 23:20:55 -0800 |
Martin von Zweigbergk |
subrepo: add tests for change/remove conflicts
stable
|
| Fri, 30 Jan 2015 04:59:05 +0900 |
FUJIWARA Katsunori |
merge: mark .hgsubstate as possibly dirty before submerge for consistency
stable
|
| Sun, 16 Nov 2014 16:26:15 -0500 |
Matt Harbison |
tests: fix globs for Windows
|
| Wed, 01 Oct 2014 01:08:17 +0200 |
Mads Kiilerich |
subrepo: remove superfluous newline from subrepo prompt
|
| Tue, 15 Jul 2014 23:34:13 +0900 |
FUJIWARA Katsunori |
templatekw: add 'subrepos' keyword to show updated subrepositories
|
| Fri, 20 Jun 2014 00:41:31 +0900 |
FUJIWARA Katsunori |
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
|
| Mon, 26 May 2014 11:44:58 -0700 |
Pierre-Yves David |
merge: drop the quotes around commit description
|
| Thu, 08 May 2014 16:50:22 -0700 |
Durham Goode |
merge: add conflict marker formatter (BC)
|
| Tue, 22 Apr 2014 02:10:25 +0200 |
Mads Kiilerich |
merge: change debug logging - test output changes but no real changes
|
| Fri, 14 Mar 2014 21:32:05 -0400 |
Matt Harbison |
cat: support cat with explicit paths in subrepos
|
| Sun, 13 Apr 2014 19:01:00 +0200 |
Mads Kiilerich |
spelling: fixes from spell checker
|
| Sat, 22 Mar 2014 23:39:51 +0900 |
FUJIWARA Katsunori |
localrepo: omit ".hgsubstate" also from "added" files
|
| Mon, 17 Mar 2014 14:57:13 -0400 |
Jordi Gutiérrez Hermoso |
commit: propagate --secret option to subrepos (issue4182)
stable
|
| Wed, 08 Jan 2014 17:23:26 -0800 |
Pierre-Yves David |
backout: add a message after backout that need manual commit
|
| Wed, 08 Jan 2014 14:53:46 -0800 |
Pierre-Yves David |
backout: avoid update on simple case.
|
| Wed, 13 Nov 2013 15:55:30 +0900 |
FUJIWARA Katsunori |
subrepo: check phase of state in each subrepositories before committing
|
| Thu, 03 Oct 2013 23:16:06 +0900 |
FUJIWARA Katsunori |
push: hide description about "-f" in the hint to prevent from using it easily
|
| Fri, 06 Sep 2013 00:38:28 +0200 |
Angel Ezquerra |
merge: let the user choose to merge, keep local or keep remote subrepo revisions
|
| Tue, 21 May 2013 15:32:15 -0500 |
Matt Mackall |
merge with stable
|
| Tue, 21 May 2013 15:29:53 -0500 |
Matt Mackall |
tests: backport some glob fixups
stable
|
| Thu, 09 May 2013 15:22:21 -0500 |
Matt Mackall |
merge with stable
|
| Thu, 09 May 2013 15:09:36 -0500 |
Matt Mackall |
tests: fix another Windows path issue
stable
|
| Thu, 02 May 2013 15:21:47 -0500 |
Matt Mackall |
check-code: add more path sep glob checks
|
| Thu, 02 May 2013 11:26:43 -0700 |
Brendan Cully |
tests: sprinkle globs over largefiles/subrepo tests for Windows
stable
|
| Sat, 09 Feb 2013 14:15:34 -0500 |
Matt Harbison |
ui: add support for fully printing chained exception stacks in ui.traceback()
|
| Mon, 15 Apr 2013 23:52:57 +0900 |
Yuya Nishihara |
subrepo: fix exception on revert when "all" option is omitted
|
| Fri, 08 Mar 2013 21:50:27 +0100 |
Angel Ezquerra |
test-subrepo: add tests for subrepo "storeclean" checks
|
| Sat, 23 Feb 2013 22:54:57 +0100 |
Simon Heimberg |
tests: remove glob lines which unnecessary match / for \ on windows
|
| Sat, 09 Feb 2013 15:22:04 -0800 |
Bryan O'Sullivan |
tests: update test output (will be folded into parent)
|
| Sat, 09 Feb 2013 21:24:36 +0000 |
Bryan O'Sullivan |
merge: don't call copies.mergecopies unless we need to
|
| Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|
| Mon, 04 Feb 2013 23:53:37 +0100 |
Mads Kiilerich |
merge with stable
|
| Mon, 04 Feb 2013 23:41:11 +0100 |
Mads Kiilerich |
tests: fix windows test failure in test-subrepo.t
stable
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
| Thu, 31 Jan 2013 01:44:29 +0100 |
Pierre-Yves David |
subrepo: allows to drop courtesy phase sync (issue3781)
stable
|
| Tue, 27 Nov 2012 21:31:59 -0500 |
Matt Harbison |
share: backout fd903f89e42b, except the test
stable
|
| Tue, 27 Nov 2012 20:56:27 -0500 |
Matt Harbison |
subrepo: use sharepath if available when locating the source repo
stable
|
| Thu, 13 Dec 2012 23:37:53 +0100 |
Angel Ezquerra |
subrepo: append subrepo path to subrepo error messages
|
| Sat, 27 Oct 2012 12:38:59 +0200 |
simon |
share: always set default path to work with subrepos (issue3518)
|
| Fri, 02 Nov 2012 20:47:03 +0100 |
Adrian Buehlmann |
test-subrepo: adapt for Windows after 17c030014ddf
stable
|
