# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1330901284 21600
# Node ID 7855c522a9cb9ac3c57dde46d5820d0fb07f3c76
# Parent  d52a6b542db196ffaf34a167938057fb5b62c7d8# Parent  674ecd23c42c76a794412e50e6cba64449243b86
merge with stable

diff -r d52a6b542db1 -r 7855c522a9cb contrib/wix/guids.wxi
--- a/contrib/wix/guids.wxi	Thu Mar 01 14:50:31 2012 +0000
+++ b/contrib/wix/guids.wxi	Sun Mar 04 16:48:04 2012 -0600
@@ -18,10 +18,10 @@
   <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?>
 
   <!-- help.wxs -->
-  <?define helpFolder.guid = {84025FAA-7EB7-4D79-A097-D2D18852D78E} ?>
+  <?define helpFolder.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?>
   
   <!-- i18n.wxs -->
-  <?define i18nFolder.guid = {EADFA693-A0B5-4f31-87C9-3997CFAC1B42} ?>
+  <?define i18nFolder.guid = {1BF8026D-CF7C-4174-AEE6-D6B7BF119248} ?>
 
   <!-- templates.wxs -->
   <?define templates.root.guid = {8DF97574-33E9-412F-8414-65B48BB18783} ?>
diff -r d52a6b542db1 -r 7855c522a9cb contrib/wix/help.wxs
--- a/contrib/wix/help.wxs	Thu Mar 01 14:50:31 2012 +0000
+++ b/contrib/wix/help.wxs	Sun Mar 04 16:48:04 2012 -0600
@@ -20,6 +20,7 @@
           <File Name="merge-tools.txt" />
           <File Name="multirevs.txt" />
           <File Name="patterns.txt" />
+          <File Name="phases.txt" />
           <File Name="revisions.txt" />
           <File Name="revsets.txt" />
           <File Name="subrepos.txt" />
diff -r d52a6b542db1 -r 7855c522a9cb contrib/wix/i18n.wxs
--- a/contrib/wix/i18n.wxs	Thu Mar 01 14:50:31 2012 +0000
+++ b/contrib/wix/i18n.wxs	Sun Mar 04 16:48:04 2012 -0600
@@ -5,7 +5,7 @@
   <?include defines.wxi ?>
 
   <?define hg_po_langs = 
-    da;de;el;fr;it;ja;pt_BR;sv;zh_CN;zh_TW
+    da;de;el;fr;it;ja;pt_BR;ro;ru;sv;zh_CN;zh_TW
   ?>
 
   <Fragment>
diff -r d52a6b542db1 -r 7855c522a9cb hgext/bugzilla.py
--- a/hgext/bugzilla.py	Thu Mar 01 14:50:31 2012 +0000
+++ b/hgext/bugzilla.py	Sun Mar 04 16:48:04 2012 -0600
@@ -336,7 +336,7 @@
 
     The earliest Bugzilla version this is tested with is version 2.16.
 
-    If your Bugzilla is version 3.2 or above, you are strongly
+    If your Bugzilla is version 3.4 or above, you are strongly
     recommended to use the XMLRPC access method instead.
     '''
 
diff -r d52a6b542db1 -r 7855c522a9cb mercurial/commands.py
--- a/mercurial/commands.py	Thu Mar 01 14:50:31 2012 +0000
+++ b/mercurial/commands.py	Sun Mar 04 16:48:04 2012 -0600
@@ -1381,7 +1381,8 @@
         at = -1
         atbranch = 'default'
         nodeids = []
-        ui.progress(_('building'), 0, unit=_('revisions'), total=total)
+        id = 0
+        ui.progress(_('building'), id, unit=_('revisions'), total=total)
         for type, data in dagparser.parsedag(text):
             if type == 'n':
                 ui.note('node %s\n' % str(data))
diff -r d52a6b542db1 -r 7855c522a9cb tests/test-debugbuilddag.t
--- a/tests/test-debugbuilddag.t	Thu Mar 01 14:50:31 2012 +0000
+++ b/tests/test-debugbuilddag.t	Sun Mar 04 16:48:04 2012 -0600
@@ -86,18 +86,19 @@
   o  0: r0 [] @ 0.00
   
 
-overwritten files
+overwritten files, starting on a non-default branch
 
   $ rm -r .hg
   $ hg init
-  $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -o
+  $ hg debugbuilddag '@start.@default.:f +3:p2 @temp <f+4 @default /p2 +2' -q -o
 tags
   $ cat .hg/localtags
-  2a8ed67d317e370eac733dccc501b12d7b9c441a f
-  4226a30965b7af58f94d0cda7e6c2c9c63e6bf90 p2
+  f778700ebd50fcf282b23a4446bd155da6453eb6 f
+  bbccf169769006e2490efd2a02f11c3d38d462bd p2
 dag
   $ hg debugdag -t -b
-  +2:f
+  @start+1
+  @default+1:f
   +3:p2
   @temp*f+3
   @default*/p2+2:tip
@@ -128,7 +129,7 @@
   |/
   o  1: r1 [] @ 1.00
   |
-  o  0: r0 [] @ 0.00
+  o  0: r0 [start] @ 0.00
   
 glog of
   $ hg glog --template '{rev}: {desc} [{branches}]\n' of
@@ -154,13 +155,13 @@
   |/
   o  1: r1 []
   |
-  o  0: r0 []
+  o  0: r0 [start]
   
 tags
   $ hg tags -v
-  tip                               11:58a51e5eb988
-  p2                                 4:4226a30965b7 local
-  f                                  1:2a8ed67d317e local
+  tip                               11:9ffe238a67a2
+  p2                                 4:bbccf1697690 local
+  f                                  1:f778700ebd50 local
 cat of
   $ hg cat of --rev tip
   r11
diff -r d52a6b542db1 -r 7855c522a9cb tests/test-inherit-mode.t
--- a/tests/test-inherit-mode.t	Thu Mar 01 14:50:31 2012 +0000
+++ b/tests/test-inherit-mode.t	Sun Mar 04 16:48:04 2012 -0600
@@ -138,7 +138,7 @@
   $ hg init setgid
   $ cd setgid
   $ chmod g+rwx .hg/store
-  $ chmod g+s .hg/store 2> /dev/null
+  $ chmod g+s .hg/store 2> /dev/null || true
   $ mkdir dir
   $ touch dir/file
   $ hg ci -qAm 'add dir/file'