Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 14:36:36 -0500] rev 795
tests: add hack to avoid problem with graphlog in unified tests
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 17 Sep 2010 20:53:56 +0200] rev 794
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 17:51:32 -0500] rev 793
tests: add exit codes to unified tests
[ original upstream message ]
Brodie Rao <brodie@bitheap.org> [Sun, 12 Sep 2010 18:05:53 -0500] rev 792
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 21:22:11 +0200] rev 791
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 16:58:13 +0200] rev 790
Explain file-wise expansion in help
Christian Ebert <blacktrash@gmx.net> [Fri, 03 Sep 2010 15:59:08 +0100] rev 789
Merge with stable
Martin Geisler <mg@lazybytes.net> [Fri, 03 Sep 2010 12:58:51 +0200] rev 788
diff: recurse into subrepositories with --subrepos/-S flag
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 31 Aug 2010 18:18:28 +0100] rev 787
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:15:30 +0900] rev 786
test-keyword: use regular expressions instead of grepping
[ original upstream message]
Christian Ebert <blacktrash@gmx.net> [Mon, 16 Aug 2010 01:01:41 +0100] rev 785
Merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 15 Aug 2010 13:26:12 -0500] rev 784
tests: drop big sed from test-keyword.t
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 16 Aug 2010 01:00:29 +0100] rev 783
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:47:57 +0100] rev 782
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:47:41 +0100] rev 781
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 10:01:09 -0500] rev 780
rollback: fix up tests
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:42:14 +0100] rev 779
Merge after backout
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:30:42 +0100] rev 778
Backed out changeset bceb04857ce1 (not all upstream hunks applied)
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 14:53:34 +0900] rev 777
tests: catch re.error if test line is not a valid regular expression
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 23:27:22 -0500] rev 776
tests: basic support for unified tests
[ original upstream message ]
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 15:44:54 -0500] rev 775
tests: move script execution in runner helpers
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Jul 2010 12:34:33 +0200] rev 774
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Jul 2010 12:32:45 +0200] rev 773
Move collecting of [keyword] patterns to reposetup (issue2303)
When cloning, prevent [keyword] filename patterns configured locally
in the source directory to persist during the update in the destination.
a) move [keyword] retrieval (back) to reposetup
b) remove the corresponding global kwtools attributes
Add test cases.
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Jul 2010 08:13:48 +0100] rev 772
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Jul 2010 10:24:31 +0200] rev 771
Add extra datefilters in a single update call
Christian Ebert <blacktrash@gmx.net> [Wed, 16 Jun 2010 11:08:43 +0200] rev 770
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Tue, 15 Jun 2010 21:58:53 +0200] rev 769
Postpone manifest calculation in kwtemplater.overwrite
We can check for file existence in the working directory (needed
in case of recording) by simply using the given context and
calculate the manifest only when there are in fact candidates
for expansion/shrinking.
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Jun 2010 11:33:01 +0100] rev 768
Merge with stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 06 Jun 2010 17:25:00 +0900] rev 767
help: show value requirement and multiple occurrence of options
this helps users to know what kind of option is:
- no value is required(flag option)
- value is required
- value is required, and multiple occurrences are allowed
each kinds are shown as below:
-f --force force push
-e --ssh CMD specify ssh command to use
-b --branch BRANCH [+] a specific branch you would like to push
if one or more 3rd type options are shown, explanation for '[+]' mark
is also shown as footnote.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jun 2010 22:50:30 +0100] rev 766
(stable) merge