Fri, 27 Jan 2012 14:19:32 -0600 resolve: mention merge-tools topic in help stable
Augie Fackler <durin42@gmail.com> [Fri, 27 Jan 2012 14:19:32 -0600] rev 16009
resolve: mention merge-tools topic in help
Fri, 27 Jan 2012 22:29:58 +0900 revset: add tests for 'remote()' predicate stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 27 Jan 2012 22:29:58 +0900] rev 16008
revset: add tests for 'remote()' predicate
Fri, 27 Jan 2012 22:29:58 +0900 revset: fix documentation for 'remote()' predicate stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 27 Jan 2012 22:29:58 +0900] rev 16007
revset: fix documentation for 'remote()' predicate current documentation for 'remote()' predicate is wrong about specification of parameters. there are 3 patterns: # of param: id: remote: - 0 current branch "defult" remote - 1 specified "defult" remote - 2 specified specified
Fri, 27 Jan 2012 22:29:58 +0900 revset: fix 'remote()' failure when remote repo has more revs than local stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 27 Jan 2012 22:29:58 +0900] rev 16006
revset: fix 'remote()' failure when remote repo has more revs than local current 'remote()' implementation uses 'r' variable, even if it is not initialized when 'if n in repo' is not true. this causes unexpected exception.
Fri, 27 Jan 2012 12:52:13 -0200 help/config: fix help command markup stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 27 Jan 2012 12:52:13 -0200] rev 16005
help/config: fix help command markup
Fri, 27 Jan 2012 18:43:31 -0600 merge with i18n stable
Matt Mackall <mpm@selenic.com> [Fri, 27 Jan 2012 18:43:31 -0600] rev 16004
merge with i18n
Fri, 27 Jan 2012 12:25:02 +0400 i18n-ru: synchronized with bf502ccc46d7; fuzzies removed stable
Alexander Sauta <demosito@gmail.com> [Fri, 27 Jan 2012 12:25:02 +0400] rev 16003
i18n-ru: synchronized with bf502ccc46d7; fuzzies removed
Thu, 26 Jan 2012 16:56:11 +0400 i18n-ru: fix typos in `resolve` help stable
Nikolaj Sjujskij <sterkrig@myopera.com> [Thu, 26 Jan 2012 16:56:11 +0400] rev 16002
i18n-ru: fix typos in `resolve` help * help entry is called 'merge-tools', not 'merge-tool'; * envvar is called HGMERGE, not HGEMERGT.
Thu, 26 Jan 2012 20:34:57 -0600 merge: defer symlink flag merging to filemerge (issue3200) stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 20:34:57 -0600] rev 16001
merge: defer symlink flag merging to filemerge (issue3200) Previously, we could change a normal file into a corrupt symlink when trying to merge a symlink flag. Now, we leave the flag alone and let filemerge deal with it (usually by a prompt). We also drop a redundant flag setting after filemerge (now dealt with by ms.resolve) that would cause similar corruption.
Thu, 26 Jan 2012 17:54:52 -0600 help: fix publish option spelling in phases topic stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 17:54:52 -0600] rev 16000
help: fix publish option spelling in phases topic
(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip