Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 11:26:20 -0600] rev 16022
push: more precise failure check on subrepo push
This will let us distinguish between nothing to push and push failed
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 11:23:17 -0600] rev 16021
push: return 0 when updating bookmarks
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 11:15:34 -0600] rev 16020
push: fix coding errors in unused branch
This branch will get re-enabled in a subsequent fix
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2012 14:07:45 -0600] rev 16019
bookmarks: move current bookmark on update -u and bare pull -u (
issue3222)
Currently, this won't update when a #branch spec is in the URL
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2012 13:36:10 -0600] rev 16018
phases: fix verify with secret csets
Verify uses repo.cancopy() to detect whether a repo is a plain old
local repo, so it was giving a confusing error message when secret
changesets were present.
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2012 12:59:21 -0600] rev 16017
mq: add secret setting
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2012 12:59:11 -0600] rev 16016
merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Sat, 28 Jan 2012 09:05:08 -0200] rev 16015
i18n-pt_BR: synchronized with
f2c49d9dee57
Mads Kiilerich <mads@kiilerich.com> [Fri, 27 Jan 2012 03:00:32 +0100] rev 16014
tests: don't rely on 'false' exit code in test-run-tests.t
On Solaris:
$ sh -c 'false ; echo $?'
255
Mads Kiilerich <mads@kiilerich.com> [Fri, 27 Jan 2012 03:00:03 +0100] rev 16013
tests: don't use alias
alias doesn't work in Solaris sh.
Mads Kiilerich <mads@kiilerich.com> [Fri, 27 Jan 2012 02:59:59 +0100] rev 16012
tests: don't include plain 'diff -U0' content in test-diff-unified.t
The only purpose of 'diff -U0' was to show that 'hg diff -U0' did almost the same.
Unfortunately 'diff -U0' on Solaris gives incorrect line numbers. Masking it
with globs wouldn't it make sense, so removing it is the best solution.
Matt Mackall <mpm@selenic.com> [Fri, 27 Jan 2012 18:43:41 -0600] rev 16011
help: add examples to phases topic
Kevin Bullock <kbullock@ringworld.org> [Fri, 27 Jan 2012 13:12:56 -0600] rev 16010
update: note updated bookmark
This brings update in line with pull: we notify the user when an action
indirectly updates a bookmark.
Augie Fackler <durin42@gmail.com> [Fri, 27 Jan 2012 14:19:32 -0600] rev 16009
resolve: mention merge-tools topic in help
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 27 Jan 2012 22:29:58 +0900] rev 16008
revset: add tests for 'remote()' predicate
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
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.
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 27 Jan 2012 12:52:13 -0200] rev 16005
help/config: fix help command markup
Matt Mackall <mpm@selenic.com> [Fri, 27 Jan 2012 18:43:31 -0600] rev 16004
merge with i18n
Alexander Sauta <demosito@gmail.com> [Fri, 27 Jan 2012 12:25:02 +0400] rev 16003
i18n-ru: synchronized with
bf502ccc46d7; fuzzies removed
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.
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.
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 17:54:52 -0600] rev 16000
help: fix publish option spelling in phases topic
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 17:54:22 -0600] rev 15999
help: add missing phase config items to config topic