Mercurial > hg
changeset 15773:371cff9610cd
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 03 Jan 2012 17:13:03 -0600 |
| parents | 83a140752239 (current diff) 1f9f9b4c2923 (diff) |
| children | 0bd17a4bed88 |
| files | mercurial/commands.py tests/test-command-template.t |
| diffstat | 5 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/wix/guids.wxi Mon Jan 02 19:30:28 2012 -0600 +++ b/contrib/wix/guids.wxi Tue Jan 03 17:13:03 2012 -0600 @@ -24,7 +24,7 @@ <?define i18nFolder.guid = {EADFA693-A0B5-4f31-87C9-3997CFAC1B42} ?> <!-- templates.wxs --> - <?define templates.root.guid = {111509CB-4C96-4035-80BC-F66A99CD5ACB} ?> + <?define templates.root.guid = {8DF97574-33E9-412F-8414-65B48BB18783} ?> <?define templates.atom.guid = {AB5D2908-BC95-44BE-9D79-069EF43D93E2} ?> <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?> <?define templates.gitweb.guid = {6A33D168-F84E-45AA-912C-23CAC2D66BCA} ?>
--- a/contrib/wix/templates.wxs Mon Jan 02 19:30:28 2012 -0600 +++ b/contrib/wix/templates.wxs Tue Jan 03 17:13:03 2012 -0600 @@ -31,6 +31,7 @@ <File Name="map-cmdline.changelog" KeyPath="yes" /> <File Name="map-cmdline.compact" /> <File Name="map-cmdline.default" /> + <File Name="map-cmdline.bisect" /> <File Name="map-cmdline.xml" /> <File Name="template-vars.txt" /> </Component>
--- a/mercurial/commands.py Mon Jan 02 19:30:28 2012 -0600 +++ b/mercurial/commands.py Tue Jan 03 17:13:03 2012 -0600 @@ -2694,7 +2694,7 @@ Returns 0 if a match is found, 1 otherwise. """ - reflags = 0 + reflags = re.M if opts.get('ignore_case'): reflags |= re.I try:
--- a/tests/test-command-template.t Mon Jan 02 19:30:28 2012 -0600 +++ b/tests/test-command-template.t Tue Jan 03 17:13:03 2012 -0600 @@ -1117,7 +1117,7 @@ $ hg log --template '{date|age}\n' > /dev/null || exit 1 $ hg log -l1 --template '{date|age}\n' - 8 years from now + 7 years from now $ hg log --template '{date|date}\n' Wed Jan 01 10:01:00 2020 +0000 Mon Jan 12 13:46:40 1970 +0000
--- a/tests/test-grep.t Mon Jan 02 19:30:28 2012 -0600 +++ b/tests/test-grep.t Tue Jan 03 17:13:03 2012 -0600 @@ -59,8 +59,9 @@ follow - $ hg grep --traceback -f 'import$' port2 + $ hg grep --traceback -f 'import\n\Z' port2 port:0:import + $ echo deport >> port2 $ hg commit -m 5 -u eggs -d '6 0' $ hg grep -f --all -nu port port2