Matt Mackall <mpm@selenic.com> [Sun, 04 Mar 2012 17:14:30 -0600] rev 16229
merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 04 Mar 2012 17:12:12 -0600] rev 16228
rebase: move bookmarks as needed with pull --rebase (issue3285)
Matt Mackall <mpm@selenic.com> [Sun, 04 Mar 2012 16:48:04 -0600] rev 16227
merge with stable
Jim Hague <jim.hague@acm.org> [Thu, 01 Mar 2012 14:42:23 +0000] rev 16226
bugzilla: correct comment typo
Javi Merino <cibervicho@gmail.com> [Thu, 01 Mar 2012 23:29:52 +0000] rev 16225
tests: ignore the return code of chmod in test-inherit-mode
In freebsd, a newly created directory has the same group as the parent
directory by default. That means that the test directory created by
test-inherit-mode.t is owned by root's group, so "chmod g+s .hg/store"
fails to set the SGID bit and returns 1. If we ignore chmod's return
code, the testsuite passes again.
Jim Hague <jim.hague@acm.org> [Thu, 01 Mar 2012 14:50:31 +0000] rev 16224
bugzilla: add xmlrpcemail submission for Bugzilla 3.6 email interface
Some of the formatting details required for bug submission via email
changed between Bugzilla 3.4 and 3.6. Bugzilla 3.4 requires lines of
the form '@fieldname = value', while 3.6 wants '@fieldname value'.
Also the field @bug_id in 3.4 becomes @id in 3.6.
Bugzilla up to and including 4.0 also recognises the 3.4 format. To save
surprises in the future, check the Bugzilla version and use the 3.6
format from all major versions >= 4. At some point we will
drop support for Bugzilla prior to 3.6 and support the new format only.