| Wed, 01 Oct 2014 01:08:17 +0200 |
Mads Kiilerich |
subrepo: remove superfluous newline from subrepo prompt
|
| Wed, 06 Aug 2014 11:43:59 -0500 |
Matt Mackall |
tests: replace exit 80 with #require
|
| Fri, 13 Jun 2014 17:42:04 -0500 |
Matt Mackall |
merge with stable
|
| Mon, 09 Jun 2014 10:34:21 -0700 |
Danek Duvall |
tests: cat error messages are different on Solaris
stable
|
| Tue, 27 May 2014 17:41:20 -0700 |
Matt Mackall |
merge with stable
|
| Thu, 08 May 2014 19:03:00 +0900 |
FUJIWARA Katsunori |
subrepo: avoid sanitizing ".hg/hgrc" in meta data area for non-hg subrepos
stable
|
| Thu, 08 May 2014 19:03:00 +0900 |
FUJIWARA Katsunori |
subrepo: make "_sanitize()" take absolute path to the root of subrepo
stable
|
| Thu, 08 May 2014 19:03:00 +0900 |
FUJIWARA Katsunori |
subrepo: invoke "_sanitize()" also after "git merge --ff"
stable
|
| Thu, 08 May 2014 19:03:00 +0900 |
FUJIWARA Katsunori |
subrepo: make "_sanitize()" work
stable
|
| Wed, 07 May 2014 00:13:22 +0200 |
Angel Ezquerra |
subrepo: use subrepo shortid method to generate subrepo diverged promptchoice
|
| Sun, 13 Apr 2014 19:01:00 +0200 |
Mads Kiilerich |
spelling: fixes from spell checker
|
| Sat, 16 Nov 2013 19:55:38 -0500 |
Mads Kiilerich |
tests: deal with new gits sending status messages to stderr
stable
|
| Fri, 06 Sep 2013 00:38:28 +0200 |
Angel Ezquerra |
merge: let the user choose to merge, keep local or keep remote subrepo revisions
|
| Thu, 21 Feb 2013 21:05:06 +0000 |
Kevin Bullock |
subrepo: fix test breakage introduced in 2b34d004e644
|
| Tue, 16 Apr 2013 22:00:41 -0500 |
Kevin Bullock |
subrepo: add regression test for issue3870
|
| Thu, 13 Dec 2012 23:37:53 +0100 |
Angel Ezquerra |
subrepo: append subrepo path to subrepo error messages
|
| 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
|
| Thu, 05 Jul 2012 02:25:49 +0200 |
Mads Kiilerich |
tests: ignore pax_global_header in test-subrepo-git.t
|
| Sat, 16 Jun 2012 22:34:06 -0400 |
Matt Harbison |
subrepo: propagate matcher to subrepos when archiving
|
| Wed, 20 Jun 2012 02:09:49 +0300 |
Eduard-Cristian Stefan |
test-subrepo-git.t: adapt for Windows
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
| Fri, 27 Apr 2012 11:02:16 +0200 |
Patrick Mezard |
subrepo: fix default implementation of forget() (issue3404)
stable
|
| Sun, 18 Mar 2012 18:21:58 -0500 |
Matt Mackall |
merge with stable
|
| Thu, 15 Mar 2012 23:02:31 +0000 |
Javi Merino |
tests: ignore git's output in test-subrepo-git.t
stable
|
| Mon, 06 Feb 2012 15:10:01 -0600 |
Matt Mackall |
subrepo: rewrite handling of subrepo state at commit (issue2403)
|
| Fri, 11 Nov 2011 11:11:11 +1111 |
Eric Roshan Eisner |
subrepo: fix git status false positive (issue3109)
stable
|
| Fri, 21 Oct 2011 00:33:08 +0200 |
Martin Geisler |
subrepos: abort commit by default if a subrepo is dirty (BC)
stable
|
| Tue, 31 May 2011 15:28:23 -0500 |
Matt Mackall |
merge with stable
|
| Sat, 28 May 2011 11:03:48 -0400 |
Eric Eisner |
subrepo: don't crash when git .hgsubstate is empty (issue2716)
stable
|
| Tue, 08 Mar 2011 15:36:56 -0500 |
Eric Eisner |
subrepo: show the source that git pulls
|
| Mon, 07 Mar 2011 23:19:17 +0100 |
Patrick Mezard |
merge with stable
|
| Mon, 07 Mar 2011 15:46:46 -0600 |
Matt Mackall |
merge with stable
|
| Mon, 07 Mar 2011 12:03:54 -0500 |
Eric Eisner |
subrepo: don't crash when git repo is missing
stable
|
| Wed, 02 Mar 2011 12:19:18 -0500 |
Eric Eisner |
subrepo: show the source that git clones
|
| Tue, 22 Feb 2011 15:11:10 -0500 |
Eric Eisner |
subrepo: expand relative sources for git subrepos
stable
|
| Wed, 16 Feb 2011 11:53:48 -0600 |
Kevin Bullock |
subrepos: print short git changeset ids
stable
|
| Wed, 09 Feb 2011 10:53:09 +0100 |
Erik Zielke |
subrepos: prompt on conflicts on update with dirty subrepos
|
| Mon, 31 Jan 2011 19:19:56 -0500 |
Eric Eisner |
test-subrepo-git.t: make compatible with old git
|
| Mon, 31 Jan 2011 13:40:05 +0100 |
Erik Zielke |
subrepo: make update -C clean the working directory for git subrepos
|
| Tue, 25 Jan 2011 16:33:46 -0800 |
Lee Cantey |
Ignore pax_global_header that some tar versions write as a file.
|
| Mon, 20 Dec 2010 13:59:33 -0500 |
Eric Eisner |
subrepo: basic support for status of git subrepos
|
| Mon, 20 Dec 2010 13:59:33 -0500 |
Eric Eisner |
subrepo: fix subrelpath for git subrepos
|
| Thu, 09 Dec 2010 16:52:14 -0500 |
Eric Eisner |
subrepo: silence git output when ui.quiet is set
|
| Mon, 06 Dec 2010 21:17:27 -0500 |
Eric Eisner |
test-subrepo-git.t: make gitroot pushable earlier
|
| Mon, 06 Dec 2010 21:17:27 -0500 |
Eric Eisner |
test-subrepo-git.t: silence git output
|
| Sun, 28 Nov 2010 17:19:23 -0500 |
Eric Eisner |
subrepo: lazily update git's local tracking branches
|
| Sun, 21 Nov 2010 22:00:51 -0500 |
Eric Eisner |
subrepo: lazier git push logic
|
| Thu, 18 Nov 2010 19:20:21 -0500 |
Eric Eisner |
subrepo: archive git subrepos
|
| Tue, 16 Nov 2010 13:29:35 +0100 |
Dan Villiom Podlaski Christiansen |
test-subrepo-git.t: portability fix.
|
| Sun, 14 Nov 2010 18:31:40 -0500 |
Eric Eisner |
subrepo: removing (and restoring) git subrepo state
|
| Sun, 14 Nov 2010 18:31:29 -0500 |
Eric Eisner |
subrepo: update and merge works with any git branch
|
| Sun, 14 Nov 2010 18:22:33 -0500 |
Eric Eisner |
subrepo: allow git subrepos to push and merge
|
| Sun, 14 Nov 2010 18:20:13 -0500 |
Eric Eisner |
subrepo: cloning and updating of git subrepos
|
| Sun, 14 Nov 2010 18:15:26 -0500 |
Eric Eisner |
subrepo: support for adding a git subrepo
|
