| Fri, 07 Oct 2016 08:51:50 -0700 |
Simon Farnsworth |
merge: add conflict labels to merge command
|
file |
diff |
annotate
|
| Sat, 08 Oct 2016 01:25:28 -0700 |
Simon Farnsworth |
merge: use labels in subrepo merge
|
file |
diff |
annotate
|
| Thu, 09 Jun 2016 13:47:42 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Thu, 02 Jun 2016 16:18:44 -0700 |
Danek Duvall |
tests-subrepo-git: use "f" to dump pwned.txt, for portability
stable
|
file |
diff |
annotate
|
| Fri, 27 May 2016 15:20:03 -0700 |
Danek Duvall |
tests-subrepo-git: emit a different "pwned" message based on the test
stable 3.8.3
|
file |
diff |
annotate
|
| Fri, 27 May 2016 15:10:38 -0700 |
Danek Duvall |
tests-subrepo-git: make the "pwned" message output in a stable order
stable
|
file |
diff |
annotate
|
| Fri, 06 May 2016 08:41:24 -0500 |
Kevin Bullock |
subrepo: use unset instead of env -u to fix test on BSDs (issue5229)
|
file |
diff |
annotate
|
| Fri, 15 Apr 2016 22:23:34 -0400 |
Matt Harbison |
test-subrepo-git: add globs for Windows
|
file |
diff |
annotate
|
| Tue, 29 Mar 2016 12:29:00 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sun, 20 Mar 2016 21:52:21 -0700 |
Mateusz Kwapich |
subrepo: set GIT_ALLOW_PROTOCOL to limit git clone protocols (SEC)
stable
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 18:29:17 +0900 |
FUJIWARA Katsunori |
tests: make chunk header of external diff glob-ed for portability
|
file |
diff |
annotate
|
| Sun, 15 Nov 2015 21:12:13 -0500 |
Matt Harbison |
tests: fix globs for Windows
|
file |
diff |
annotate
|
| Tue, 10 Nov 2015 14:29:13 -0800 |
Christian Delahousse |
git-subrepos: revert respects specified location to save .orig files
|
file |
diff |
annotate
|
| Thu, 07 May 2015 16:43:58 -0700 |
Pierre-Yves David |
test-subrepo-git: ignore pax_global_header when listing archive
|
file |
diff |
annotate
|
| Tue, 05 May 2015 20:52:38 -0400 |
Matt Harbison |
archive: drop the leading '.' path component from the prefix (issue4634)
|
file |
diff |
annotate
|
| Wed, 06 May 2015 17:15:38 +0200 |
Mathias De Maré |
subrepo: correctly handle git subdirectory status change
|
file |
diff |
annotate
|
| Mon, 04 May 2015 22:33:29 -0400 |
Matt Harbison |
archive: always use portable path component separators with subrepos
stable
|
file |
diff |
annotate
|
| Sun, 03 May 2015 12:49:15 -0700 |
Siddharth Agarwal |
util.checkcase: don't abort on broken symlinks
stable
|
file |
diff |
annotate
|
| Tue, 14 Apr 2015 20:09:56 +0200 |
Mathias De Maré |
subrepo: add include/exclude support for diffing git subrepos
|
file |
diff |
annotate
|
| Thu, 02 Apr 2015 08:18:33 +0200 |
Mathias De Maré |
tests: handle deleted .hg directory (git 2.2.0 and higher) (issue4585)
|
file |
diff |
annotate
|
| Mon, 09 Mar 2015 22:14:09 +0100 |
Mathias De Maré |
subrepo: add status support for ignored and clean files in git subrepos
|
file |
diff |
annotate
|
| Fri, 27 Feb 2015 23:30:42 -0500 |
Matt Harbison |
subrepo: warn when adding already tracked files in gitsubrepo
|
file |
diff |
annotate
|
| Thu, 26 Feb 2015 15:53:54 -0500 |
Matt Harbison |
subrepo: don't exclude files in .hgignore when adding to git
|
file |
diff |
annotate
|
| Tue, 24 Feb 2015 08:49:22 +0100 |
Mathias De Maré |
subrepos: support adding files in git subrepos
|
file |
diff |
annotate
|
| Sun, 01 Feb 2015 14:09:31 +0100 |
Mathias De Maré |
subrepo: add 'cat' support for git subrepos
|
file |
diff |
annotate
|
| Tue, 27 Jan 2015 20:57:43 -0500 |
Matt Harbison |
subrepo: don't abort in add when non-hg subrepos are present (issue4513)
stable
|
file |
diff |
annotate
|
| Wed, 21 Jan 2015 21:47:27 +0100 |
Mathias De Maré |
subrepo: correctly add newline for git subrepo diffs
stable
|
file |
diff |
annotate
|
| Thu, 22 Jan 2015 00:10:26 +0900 |
FUJIWARA Katsunori |
tests: discard useless "(glob)" in "reverting subrepo" lines
stable
|
file |
diff |
annotate
|
| Tue, 30 Dec 2014 15:51:14 -0600 |
Matt Mackall |
test-subrepo-git: ignore global git config
|
file |
diff |
annotate
|
| Sun, 28 Dec 2014 10:42:25 +0100 |
Mathias De Maré |
subrepo: add full revert support for git subrepos
|
file |
diff |
annotate
|
| Sun, 14 Dec 2014 21:00:58 +0100 |
Mathias De Maré |
tests: avoid git diffstat singular/plural output difference
|
file |
diff |
annotate
|
| Sun, 14 Dec 2014 11:34:51 +0100 |
Mathias De Maré |
subrepo: add revert support without backup for git subrepos
|
file |
diff |
annotate
|
| Sat, 13 Dec 2014 09:45:00 +0100 |
Mathias De Maré |
tests: allow more flexibility in git diffstat output
|
file |
diff |
annotate
|
| Wed, 10 Dec 2014 10:32:51 +0100 |
Mathias De Maré |
subrepo: add partial diff support for git subrepos
|
file |
diff |
annotate
|
| Fri, 28 Nov 2014 20:16:15 +0100 |
Mathias De Maré |
subrepo: add status support for ignored files in git subrepos
|
file |
diff |
annotate
|
| Wed, 01 Oct 2014 01:08:17 +0200 |
Mads Kiilerich |
subrepo: remove superfluous newline from subrepo prompt
|
file |
diff |
annotate
|
| Wed, 06 Aug 2014 11:43:59 -0500 |
Matt Mackall |
tests: replace exit 80 with #require
|
file |
diff |
annotate
|
| 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
|
| Mon, 07 Mar 2011 15:46:46 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Mon, 07 Mar 2011 12:03:54 -0500 |
Eric Eisner |
subrepo: don't crash when git repo is missing
stable
|
file |
diff |
annotate
|
| Wed, 02 Mar 2011 12:19:18 -0500 |
Eric Eisner |
subrepo: show the source that git clones
|
file |
diff |
annotate
|
| Tue, 22 Feb 2011 15:11:10 -0500 |
Eric Eisner |
subrepo: expand relative sources for git subrepos
stable
|
file |
diff |
annotate
|
| Wed, 16 Feb 2011 11:53:48 -0600 |
Kevin Bullock |
subrepos: print short git changeset ids
stable
|
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
|
| Mon, 31 Jan 2011 19:19:56 -0500 |
Eric Eisner |
test-subrepo-git.t: make compatible with old git
|
file |
diff |
annotate
|
| Mon, 31 Jan 2011 13:40:05 +0100 |
Erik Zielke |
subrepo: make update -C clean the working directory for git subrepos
|
file |
diff |
annotate
|
| Tue, 25 Jan 2011 16:33:46 -0800 |
Lee Cantey |
Ignore pax_global_header that some tar versions write as a file.
|
file |
diff |
annotate
|
| Mon, 20 Dec 2010 13:59:33 -0500 |
Eric Eisner |
subrepo: basic support for status of git subrepos
|
file |
diff |
annotate
|
| Mon, 20 Dec 2010 13:59:33 -0500 |
Eric Eisner |
subrepo: fix subrelpath for git subrepos
|
file |
diff |
annotate
|
| Thu, 09 Dec 2010 16:52:14 -0500 |
Eric Eisner |
subrepo: silence git output when ui.quiet is set
|
file |
diff |
annotate
|
| Mon, 06 Dec 2010 21:17:27 -0500 |
Eric Eisner |
test-subrepo-git.t: make gitroot pushable earlier
|
file |
diff |
annotate
|
| Mon, 06 Dec 2010 21:17:27 -0500 |
Eric Eisner |
test-subrepo-git.t: silence git output
|
file |
diff |
annotate
|
| Sun, 28 Nov 2010 17:19:23 -0500 |
Eric Eisner |
subrepo: lazily update git's local tracking branches
|
file |
diff |
annotate
|
| Sun, 21 Nov 2010 22:00:51 -0500 |
Eric Eisner |
subrepo: lazier git push logic
|
file |
diff |
annotate
|
| Thu, 18 Nov 2010 19:20:21 -0500 |
Eric Eisner |
subrepo: archive git subrepos
|
file |
diff |
annotate
|
| Tue, 16 Nov 2010 13:29:35 +0100 |
Dan Villiom Podlaski Christiansen |
test-subrepo-git.t: portability fix.
|
file |
diff |
annotate
|
| Sun, 14 Nov 2010 18:31:40 -0500 |
Eric Eisner |
subrepo: removing (and restoring) git subrepo state
|
file |
diff |
annotate
|
| Sun, 14 Nov 2010 18:31:29 -0500 |
Eric Eisner |
subrepo: update and merge works with any git branch
|
file |
diff |
annotate
|
| Sun, 14 Nov 2010 18:22:33 -0500 |
Eric Eisner |
subrepo: allow git subrepos to push and merge
|
file |
diff |
annotate
|
| Sun, 14 Nov 2010 18:20:13 -0500 |
Eric Eisner |
subrepo: cloning and updating of git subrepos
|
file |
diff |
annotate
|
| Sun, 14 Nov 2010 18:15:26 -0500 |
Eric Eisner |
subrepo: support for adding a git subrepo
|
file |
diff |
annotate
|