| 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
|
| Wed, 24 Oct 2012 18:45:22 +0200 |
Simon Heimberg |
subrepo: only do clean update when overwrite is set (issue3276)
stable
|
| Wed, 08 Aug 2012 18:10:16 +0200 |
Mads Kiilerich |
check-code: fix check for trailing whitespace on sh command lines
|
| Fri, 27 Jul 2012 13:56:19 +0200 |
Patrick Mezard |
identity: show trailing '+' for dirty subrepos (issue2839)
stable
|
| Mon, 11 Jun 2012 01:38:32 +0200 |
Mads Kiilerich |
tests: cleanup of tests that got lost in their own nested directories
|
| Sat, 28 Apr 2012 01:55:39 +0200 |
Mads Kiilerich |
tests: add missing accept of native pathname separator
stable
|
| Tue, 17 Apr 2012 07:22:44 +0200 |
Angel Ezquerra |
tests: add test for fileset 'subrepo' keyword
|
| Wed, 28 Mar 2012 11:42:17 +0200 |
Angel Ezquerra |
revert: add support for reverting subrepos without --no-backup and/or --all
|
| Wed, 28 Mar 2012 11:42:17 +0200 |
Angel Ezquerra |
revert: add support for reverting subrepos
|
| Fri, 10 Feb 2012 17:09:23 -0600 |
Matt Mackall |
merge with stable
|
| Fri, 10 Feb 2012 16:09:30 -0600 |
Matt Mackall |
pull: backout change to return code
stable
|
| Mon, 06 Feb 2012 15:10:01 -0600 |
Matt Mackall |
subrepo: rewrite handling of subrepo state at commit (issue2403)
|
| Mon, 30 Jan 2012 16:01:54 -0600 |
Matt Mackall |
pull: return 1 when no changes found (BC)
stable
|
| Thu, 15 Dec 2011 16:26:33 +0100 |
Martin Geisler |
merge with stable
|
| Thu, 15 Dec 2011 16:18:10 +0100 |
Martin Geisler |
test-subrepo: test for Issue3153
stable
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
| Thu, 08 Dec 2011 16:01:44 -0600 |
Matt Mackall |
merge with stable
|
| Thu, 08 Dec 2011 14:32:44 -0600 |
Matt Mackall |
branch: warn on branching
stable
|
| Thu, 17 Nov 2011 23:02:18 -0600 |
Matt Mackall |
merge with crew
|
