| Fri, 13 Jun 2014 17:42:04 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Mon, 09 Jun 2014 10:34:21 -0700 |
Danek Duvall |
tests: cat error messages are different on Solaris
stable
|
file |
diff |
annotate
|
| Tue, 27 May 2014 17:41:20 -0700 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Thu, 08 May 2014 19:03:00 +0900 |
FUJIWARA Katsunori |
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
stable
|
file |
diff |
annotate
|
| Thu, 08 May 2014 19:03:00 +0900 |
FUJIWARA Katsunori |
subrepo: make "_sanitize()" take absolute path to the root of subrepo
stable
|
file |
diff |
annotate
|
| Thu, 08 May 2014 19:03:00 +0900 |
FUJIWARA Katsunori |
subrepo: invoke "_sanitize()" also after "git merge --ff"
stable
|
file |
diff |
annotate
|
| Thu, 08 May 2014 19:03:00 +0900 |
FUJIWARA Katsunori |
subrepo: make "_sanitize()" work
stable
|
file |
diff |
annotate
|
| Wed, 07 May 2014 00:13:22 +0200 |
Angel Ezquerra |
subrepo: use subrepo shortid method to generate subrepo diverged promptchoice
|
file |
diff |
annotate
|
| Sun, 13 Apr 2014 19:01:00 +0200 |
Mads Kiilerich |
spelling: fixes from spell checker
|
file |
diff |
annotate
|
| Sat, 16 Nov 2013 19:55:38 -0500 |
Mads Kiilerich |
tests: deal with new gits sending status messages to stderr
stable
|
file |
diff |
annotate
|
| Fri, 06 Sep 2013 00:38:28 +0200 |
Angel Ezquerra |
merge: let the user choose to merge, keep local or keep remote subrepo revisions
|
file |
diff |
annotate
|
| Thu, 21 Feb 2013 21:05:06 +0000 |
Kevin Bullock |
subrepo: fix test breakage introduced in 2b34d004e644
|
file |
diff |
annotate
|
| Tue, 16 Apr 2013 22:00:41 -0500 |
Kevin Bullock |
subrepo: add regression test for issue3870
|
file |
diff |
annotate
|
| Thu, 13 Dec 2012 23:37:53 +0100 |
Angel Ezquerra |
subrepo: append subrepo path to subrepo error messages
|
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
|
| Thu, 05 Jul 2012 02:25:49 +0200 |
Mads Kiilerich |
tests: ignore pax_global_header in test-subrepo-git.t
|
file |
diff |
annotate
|
| Sat, 16 Jun 2012 22:34:06 -0400 |
Matt Harbison |
subrepo: propagate matcher to subrepos when archiving
|
file |
diff |
annotate
|
| Wed, 20 Jun 2012 02:09:49 +0300 |
Eduard-Cristian Stefan |
test-subrepo-git.t: adapt for Windows
|
file |
diff |
annotate
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
file |
diff |
annotate
|
| Fri, 27 Apr 2012 11:02:16 +0200 |
Patrick Mezard |
subrepo: fix default implementation of forget() (issue3404)
stable
|
file |
diff |
annotate
|
| Sun, 18 Mar 2012 18:21:58 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Thu, 15 Mar 2012 23:02:31 +0000 |
Javi Merino |
tests: ignore git's output in test-subrepo-git.t
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
|
| Fri, 11 Nov 2011 11:11:11 +1111 |
Eric Roshan Eisner |
subrepo: fix git status false positive (issue3109)
stable
|
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
|
| Tue, 31 May 2011 15:28:23 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sat, 28 May 2011 11:03:48 -0400 |
Eric Eisner |
subrepo: don't crash when git .hgsubstate is empty (issue2716)
stable
|
file |
diff |
annotate
|
| Tue, 08 Mar 2011 15:36:56 -0500 |
Eric Eisner |
subrepo: show the source that git pulls
|
file |
diff |
annotate
|
| Mon, 07 Mar 2011 23:19:17 +0100 |
Patrick Mezard |
merge with stable
|
file |
diff |
annotate
|