| Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|
file |
diff |
annotate
|
| Mon, 04 Feb 2013 23:53:37 +0100 |
Mads Kiilerich |
merge with stable
|
file |
diff |
annotate
|
| Mon, 04 Feb 2013 23:41:11 +0100 |
Mads Kiilerich |
tests: fix windows test failure in test-subrepo.t
stable
|
file |
diff |
annotate
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
file |
diff |
annotate
|
| Thu, 31 Jan 2013 01:44:29 +0100 |
Pierre-Yves David |
subrepo: allows to drop courtesy phase sync (issue3781)
stable
|
file |
diff |
annotate
|
| Tue, 27 Nov 2012 21:31:59 -0500 |
Matt Harbison |
share: backout fd903f89e42b, except the test
stable
|
file |
diff |
annotate
|
| Tue, 27 Nov 2012 20:56:27 -0500 |
Matt Harbison |
subrepo: use sharepath if available when locating the source repo
stable
|
file |
diff |
annotate
|
| Thu, 13 Dec 2012 23:37:53 +0100 |
Angel Ezquerra |
subrepo: append subrepo path to subrepo error messages
|
file |
diff |
annotate
|
| Sat, 27 Oct 2012 12:38:59 +0200 |
simon |
share: always set default path to work with subrepos (issue3518)
|
file |
diff |
annotate
|
| Fri, 02 Nov 2012 20:47:03 +0100 |
Adrian Buehlmann |
test-subrepo: adapt for Windows after 17c030014ddf
stable
|
file |
diff |
annotate
|
| Wed, 24 Oct 2012 18:45:22 +0200 |
Simon Heimberg |
subrepo: only do clean update when overwrite is set (issue3276)
stable
|
file |
diff |
annotate
|
| Wed, 08 Aug 2012 18:10:16 +0200 |
Mads Kiilerich |
check-code: fix check for trailing whitespace on sh command lines
|
file |
diff |
annotate
|
| Fri, 27 Jul 2012 13:56:19 +0200 |
Patrick Mezard |
identity: show trailing '+' for dirty subrepos (issue2839)
stable
|
file |
diff |
annotate
|
| Mon, 11 Jun 2012 01:38:32 +0200 |
Mads Kiilerich |
tests: cleanup of tests that got lost in their own nested directories
|
file |
diff |
annotate
|
| Sat, 28 Apr 2012 01:55:39 +0200 |
Mads Kiilerich |
tests: add missing accept of native pathname separator
stable
|
file |
diff |
annotate
|
| Tue, 17 Apr 2012 07:22:44 +0200 |
Angel Ezquerra |
tests: add test for fileset 'subrepo' keyword
|
file |
diff |
annotate
|
| Wed, 28 Mar 2012 11:42:17 +0200 |
Angel Ezquerra |
revert: add support for reverting subrepos without --no-backup and/or --all
|
file |
diff |
annotate
|
| Wed, 28 Mar 2012 11:42:17 +0200 |
Angel Ezquerra |
revert: add support for reverting subrepos
|
file |
diff |
annotate
|
| Fri, 10 Feb 2012 17:09:23 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Fri, 10 Feb 2012 16:09:30 -0600 |
Matt Mackall |
pull: backout change to return code
stable
|
file |
diff |
annotate
|
| Mon, 06 Feb 2012 15:10:01 -0600 |
Matt Mackall |
subrepo: rewrite handling of subrepo state at commit (issue2403)
|
file |
diff |
annotate
|
| Mon, 30 Jan 2012 16:01:54 -0600 |
Matt Mackall |
pull: return 1 when no changes found (BC)
stable
|
file |
diff |
annotate
|
| Thu, 15 Dec 2011 16:26:33 +0100 |
Martin Geisler |
merge with stable
|
file |
diff |
annotate
|
| Thu, 15 Dec 2011 16:18:10 +0100 |
Martin Geisler |
test-subrepo: test for Issue3153
stable
|
file |
diff |
annotate
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
file |
diff |
annotate
|
| Thu, 08 Dec 2011 16:01:44 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Thu, 08 Dec 2011 14:32:44 -0600 |
Matt Mackall |
branch: warn on branching
stable
|
file |
diff |
annotate
|
| Thu, 17 Nov 2011 23:02:18 -0600 |
Matt Mackall |
merge with crew
|
file |
diff |
annotate
|
| Wed, 16 Nov 2011 03:45:14 +0100 |
Mads Kiilerich |
tests: add missing '(glob)'s to match '\' in paths in test output on windows
|
file |
diff |
annotate
|
| Wed, 16 Nov 2011 18:04:19 -0600 |
Matt Mackall |
merge: give a special message for internal:merge failure (issue3105)
|
file |
diff |
annotate
|
| Wed, 09 Nov 2011 19:46:51 -0500 |
David M. Carr |
forget: support forgetting explicit paths in subrepos
|
file |
diff |
annotate
|
| Wed, 09 Nov 2011 19:46:49 -0500 |
David M. Carr |
tests: add test for behavior of forget for explicit path in subrepo
|
file |
diff |
annotate
|
| Mon, 07 Nov 2011 03:25:10 +0100 |
Mads Kiilerich |
tests: make (glob) on windows accept \ instead of /
|
file |
diff |
annotate
|
| Wed, 02 Nov 2011 01:17:11 -0400 |
David M. Carr |
add: support adding explicit files in subrepos
|
file |
diff |
annotate
|
| Tue, 01 Nov 2011 23:53:29 -0400 |
David M. Carr |
tests: add test for add of explicit path in subrepo
|
file |
diff |
annotate
|
| Fri, 21 Oct 2011 00:33:08 +0200 |
Martin Geisler |
subrepos: abort commit by default if a subrepo is dirty (BC)
stable
|
file |
diff |
annotate
|
| Sat, 15 Oct 2011 01:06:52 +0200 |
Angel Ezquerra |
revert: warn that subrepos cannot be reverted
|
file |
diff |
annotate
|
| Tue, 11 Oct 2011 18:18:15 -0700 |
Eric Roshan Eisner |
cmdutil.bailifchanged: abort for dirty subrepos
|
file |
diff |
annotate
|
| Mon, 06 Jun 2011 15:17:40 -0500 |
Matt Mackall |
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
|
file |
diff |
annotate
|
| Fri, 03 Jun 2011 12:16:17 +0200 |
Adrian Buehlmann |
prepush: print short hash of first new head in abort message
|
file |
diff |
annotate
|
| Wed, 18 May 2011 19:22:55 +0200 |
Martin Geisler |
merge with stable
|
file |
diff |
annotate
|
| Wed, 18 May 2011 15:13:26 +0200 |
Martin Geisler |
subrepo: respect non-default path for incoming/outgoing
stable
|
file |
diff |
annotate
|
| Mon, 09 May 2011 17:15:44 +0200 |
Martin Geisler |
subrepo: create subrepos using clone instead of pull
|
file |
diff |
annotate
|
| Wed, 09 Feb 2011 10:53:09 +0100 |
Erik Zielke |
subrepos: prompt on conflicts on update with dirty subrepos
|
file |
diff |
annotate
|
| Tue, 15 Feb 2011 22:25:48 +0100 |
Patrick Mezard |
commit: abort if a subrepo is modified and ui.commitsubrepos=no
|
file |
diff |
annotate
|
| Mon, 31 Jan 2011 13:33:41 +0100 |
Erik Zielke |
subrepo: make update -C clean the working directory for svn subrepos
stable
|
file |
diff |
annotate
|
| Tue, 04 Jan 2011 03:53:11 -0800 |
Oleg Stepanov |
subrepo: do not report known files inside repositories as unknown
stable
|
file |
diff |
annotate
|
| Wed, 27 Oct 2010 00:28:40 +0200 |
Mads Kiilerich |
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
stable
|
file |
diff |
annotate
|
| Wed, 20 Oct 2010 17:38:21 -0500 |
Kevin Bullock |
pull: silence spurious 'requesting all changes' message
stable
|
file |
diff |
annotate
|
| Tue, 19 Oct 2010 03:56:20 +0200 |
Mads Kiilerich |
subrepo: abort instead of pushing/pulling to the repo itself
|
file |
diff |
annotate
|
| Fri, 08 Oct 2010 22:36:10 -0500 |
Mads Kiilerich |
tests: remove redundant globs
|
file |
diff |
annotate
|
| Thu, 30 Sep 2010 09:49:40 +0200 |
Erik Zielke |
tests: removed test names in tests
|
file |
diff |
annotate
|
| Fri, 24 Sep 2010 10:13:49 +0200 |
Martin Geisler |
tests: added a short description to issue numbers
|
file |
diff |
annotate
|
| Wed, 22 Sep 2010 16:06:02 -0500 |
Brodie Rao |
tests: add glob matching for unified tests
|
file |
diff |
annotate
|
| Wed, 22 Sep 2010 16:06:00 -0500 |
Brodie Rao |
tests: require regexes in unified tests to be marked with " (re)"
|
file |
diff |
annotate
|
| Wed, 22 Sep 2010 16:05:58 -0500 |
Brodie Rao |
tests: improve regexes in unified tests
|
file |
diff |
annotate
|
| Fri, 17 Sep 2010 17:03:04 -0500 |
Matt Mackall |
tests: exit 0 no longer needed on unified tests
|
file |
diff |
annotate
|
| Thu, 16 Sep 2010 17:51:32 -0500 |
Matt Mackall |
tests: add exit codes to unified tests
|
file |
diff |
annotate
|
| Sun, 12 Sep 2010 18:05:53 -0500 |
Brodie Rao |
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
|
file |
diff |
annotate
|
| Tue, 31 Aug 2010 16:36:31 +0200 |
Martin Geisler |
commit: sort subrepos before committing for stable test output
|
file |
diff |
annotate
|