FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 05 Jun 2014 16:47:14 +0900] rev 21706
keyword: suppress keyword expansion while 'hg backout' for internal merge
Before this patch, 'hg backout' may cause unexpected conflict, if 'hg
backout'-ed changes are located near lines in which keywords are
embedded, because keywords are substituted with other strings in the
working directory.
This patch suppresses keyword expansion while 'hg backout' for
internal merge by adding 'backout' to 'restricted' command list like
'merge'.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 05 Jun 2014 16:47:14 +0900] rev 21705
keyword: suppress keyword expansion while 'hg graft' for internal merge
Before this patch, 'hg graft' may cause unexpected conflict, if 'hg
graft'-ed changes are located near lines in which keywords are
embedded, because keywords are substituted with other strings in the
working directory.
This patch suppresses keyword expansion while 'hg graft' for internal
merge by adding 'graft' to 'restricted' command list like 'merge'.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 05 Jun 2014 16:47:13 +0900] rev 21704
keyword: suppress keyword expansion while 'hg rebase' for internal merge
Before this patch, 'hg rebase' may cause unexpected conflict, if 'hg
rebase'-ed changes are located near lines in which keywords are
embedded, because keywords are substituted with other strings in the
working directory.
This patch suppresses keyword expansion while 'hg rebase' for internal
merge by adding 'rebase' to 'restricted' command list like 'merge'.
This patch specifies '--keep' to 'hg rebase', because revision #10 is
useful also for tests in succeeding patches.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 05 Jun 2014 16:47:13 +0900] rev 21703
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
Before this patch, 'hg unshelve' may cause unexpected conflict, if 'hg
unshelve'-ed changes are located near lines in which keywords are
embedded, because keywords are substituted with other strings in the
working directory.
This patch suppresses keyword expansion while 'hg unshelve' for
internal merge by adding 'unshelve' to 'restricted' command list like
'merge'.
Matt Mackall <mpm@selenic.com> [Sun, 01 Jun 2014 16:01:01 -0700] rev 21702
merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 01 Jun 2014 14:15:43 -0700] rev 21701
Added signature for changeset 269c80ee5b3c
Matt Mackall <mpm@selenic.com> [Sun, 01 Jun 2014 14:15:15 -0700] rev 21700
Added tag 3.0.1 for changeset 269c80ee5b3c
Matt Mackall <mpm@selenic.com> [Sun, 01 Jun 2014 13:58:28 -0700] rev 21699
merge with i18n
Gregory Szorc <gregory.szorc@gmail.com> [Wed, 21 May 2014 18:02:35 -0700] rev 21698
localrepo: prevent leak of transaction object (issue4258)
The onclose() closure added in cd443c7589cc held a regular reference to
the transaction object. This was causing the transaction to not gc and
a leak to occur.
The closure now holds a reference to the weakref instance and the leak
goes away.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 30 May 2014 19:52:55 +0900] rev 21697
i18n-ja: synchronized with 9e12579369f1