Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 15:56:35 -0600] rev 16038
push: don't treat bookmark as a found change
Treating bookmarks as a found change results in confusing
documentation or output and is less useful for scripting.
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 14:44:01 -0600] rev 16037
glossary: add phase terms
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 14:14:18 -0600] rev 16036
merge with i18n
Jens Bäckman <jens.backman@gmail.com> [Mon, 30 Jan 2012 16:28:27 +0100] rev 16035
i18n-sv: snchronized with ed9f40bc346f
Alexander Sauta <demosito@gmail.com> [Mon, 30 Jan 2012 13:04:13 +0400] rev 16034
i18n-ru: phases help translated
Alexander Sauta <demosito@gmail.com> [Mon, 30 Jan 2012 11:52:38 +0400] rev 16033
i18n-ru: minor corrections on unclear strings
Andrei Polushin <polushin@gmail.com> [Mon, 30 Jan 2012 02:48:03 +0700] rev 16032
i18n-ru: synchronized with 2605fc990725
Andrei Polushin <polushin@gmail.com> [Mon, 30 Jan 2012 02:07:04 +0700] rev 16031
i18n-ru: verifying uncertain translations.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jan 2012 17:46:15 +0100] rev 16030
phases: allow phase name in phases.new-commit settings
Before this commit only phase index where accepted
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jan 2012 15:17:08 +0100] rev 16029
qfinish: do not set secret changeset to draft if mq.secret=false
If mq.secret=false, mq should not touch phase
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jan 2012 17:39:05 +0100] rev 16028
mq: take mq.secret configuration into account when picking the default phase
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jan 2012 17:37:45 +0100] rev 16027
qimport: when mq.secret=True set qimported revision as secret
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jan 2012 17:36:30 +0100] rev 16026
qrefresh: keep changeset phase during refresh
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jan 2012 17:33:09 +0100] rev 16025
phases: write default phase data as soon as possible.
Marks phase data as dirty when computing default phase. Actual writing is done
when the lock is released. So, read only operation don't write phase data
because they don't lock the repo.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jan 2012 18:06:57 +0100] rev 16024
phase: accept old style revision specification
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 11:32:09 -0600] rev 16023
push: return 1 if no changes found (issue3228)
Currently we have the following return codes if nothing is found:
commit incoming outgoing pull push
intended 1 1 1 1 1
documented 1 1 1 0 1
actual 1 1 1 0 0
This fixes the lower-right entry.
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