| Sun, 08 Nov 2009 10:29:52 -0600 |
Matt Mackall |
submerge: properly deal with overwrites
|
file |
diff |
annotate
|
| Sun, 08 Nov 2009 10:24:18 -0600 |
Matt Mackall |
subrepo: add more debugging output, lose _ markers
|
file |
diff |
annotate
|
| Sat, 07 Nov 2009 16:31:43 -0600 |
Matt Mackall |
subrepo: do a linear update when appropriate
|
file |
diff |
annotate
|
| Sat, 07 Nov 2009 16:30:42 -0600 |
Matt Mackall |
subrepo: notice dirty subrepo states when merging
|
file |
diff |
annotate
|
| Sat, 07 Nov 2009 16:29:49 -0600 |
Matt Mackall |
subrepo: add some debug output to submerge
|
file |
diff |
annotate
|
| Sat, 07 Nov 2009 14:09:16 -0600 |
Matt Mackall |
subrepo: more robust split for .hgsubstate parsing
|
file |
diff |
annotate
|
| Wed, 30 Sep 2009 21:42:51 -0500 |
Matt Mackall |
Merge with -stable
|
file |
diff |
annotate
|
| Wed, 30 Sep 2009 18:47:33 -0500 |
Matt Mackall |
subrepo: add auto-pull for merge
|
file |
diff |
annotate
|
| Thu, 23 Jul 2009 20:44:26 +0200 |
Dirkjan Ochtman |
merge with crew-stable
|
file |
diff |
annotate
|
| Wed, 22 Jul 2009 17:53:23 -0500 |
Matt Mackall |
subrepo: use '/' for joining non-local paths
|
file |
diff |
annotate
|
| Sat, 04 Jul 2009 14:18:15 +0100 |
Abderrahim Kitouni |
subrepo: use hg.repository instead of creating localrepo directly
|
file |
diff |
annotate
|
| Tue, 07 Jul 2009 17:26:20 +0200 |
Martin Geisler |
filemerge, subrepo: correct indention
|
file |
diff |
annotate
|
| Sun, 21 Jun 2009 01:13:19 +0200 |
Simon Heimberg |
ui: extract choice from prompt
|
file |
diff |
annotate
|
| Wed, 01 Jul 2009 13:55:24 -0500 |
Matt Mackall |
subrepo: audit subrepo paths
|
file |
diff |
annotate
|
| Fri, 19 Jun 2009 14:28:29 +0800 |
Dongsheng Song |
Fix warning: Seen unexpected token "%"
|
file |
diff |
annotate
|
| Mon, 15 Jun 2009 02:46:20 -0500 |
Matt Mackall |
subrepo: basic push support
|
file |
diff |
annotate
|
| Mon, 15 Jun 2009 02:45:38 -0500 |
Matt Mackall |
subrepo: add update/merge logic
|
file |
diff |
annotate
|
| Mon, 15 Jun 2009 02:45:38 -0500 |
Matt Mackall |
commit: recurse into subrepositories
|
file |
diff |
annotate
|
| Mon, 15 Jun 2009 02:45:38 -0500 |
Matt Mackall |
subrepo: introduce basic state parsing
|
file |
diff |
annotate
|