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
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 26 Jan 2012 17:23:43 -0200] rev 15998
help/phases: remove trailing whitespace
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 11:23:15 -0600] rev 15997
sslutil: more helpful fingerprint mismatch message
This will aid debugging for users of sites that renew certs.
Matt Mackall <mpm@selenic.com> [Thu, 26 Jan 2012 11:23:14 -0600] rev 15996
help: add phases topic
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 26 Jan 2012 12:09:14 -0200] rev 15995
i18n-pt_BR: synchronized with 0b05e0bfdc1c
Matt Mackall <mpm@selenic.com> [Wed, 25 Jan 2012 17:14:10 -0600] rev 15994
copies: remove stray print
Matt Mackall <mpm@selenic.com> [Wed, 25 Jan 2012 17:14:08 -0600] rev 15993
scmutil: unify some 'no changes found' messages
This keeps the wording more consistent for secret csets
Alain Leufroy <alain.leufroyATgmailMYDOTcom> [Wed, 25 Jan 2012 19:41:34 +0100] rev 15992
outgoing: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom> [Wed, 25 Jan 2012 19:05:16 +0100] rev 15991
bundle: display info about secret changets while no sharable changeset found
Augie Fackler <durin42@gmail.com> [Mon, 23 Jan 2012 12:26:01 -0600] rev 15990
test-rebase-collapse: Add test for rebase regression introduced in 12309c09d19a
Idan Kamara <idankk86@gmail.com> [Thu, 26 Jan 2012 00:21:55 +0200] rev 15989
test-commandserver: test that phase data is being refreshed
Idan Kamara <idankk86@gmail.com> [Thu, 26 Jan 2012 00:21:54 +0200] rev 15988
localrepo: delete _phaserev when invalidating caches
Idan Kamara <idankk86@gmail.com> [Thu, 26 Jan 2012 00:21:53 +0200] rev 15987
localrepo: fix phaseroots filecache definition
it's in .hg/store
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 24 Jan 2012 19:49:30 +0100] rev 15986
discovery: fix regression when checking heads for pre 1.4 client (issue3218)
This code is not run by the test suite and silly name error were lurking here.
Jens Bäckman <jens.backman@gmail.com> [Wed, 25 Jan 2012 14:06:04 -0600] rev 15985
help: mark strings for translation
David Soria Parra <dsp@php.net> [Wed, 25 Jan 2012 20:03:46 +0100] rev 15984
bookmarks: respect --debug during incoming/outgoing
Na'Tosha Bard <natosha@unity3d.com> [Wed, 25 Jan 2012 16:52:16 +0100] rev 15983
largefiles: fix revert on missing largefile (issue3217)
Na'Tosha Bard <natosha@unity3d.com> [Wed, 25 Jan 2012 14:10:01 +0100] rev 15982
largefiles: fix transplant for all cases (issue3192)
Andrei Polushin <polushin@gmail.com> [Wed, 25 Jan 2012 03:01:19 +0700] rev 15981
i18n-ru: synchronized with 9f2ed48f8cda
Jens Bäckman <jens.backman@gmail.com> [Wed, 25 Jan 2012 10:13:06 +0100] rev 15980
i18n-sv: translated phase
Jens Bäckman <jens.backman@gmail.com> [Wed, 25 Jan 2012 09:33:48 +0100] rev 15979
i18n-sv: translating strings for add, annotate, debuginstall
Jens Bäckman <jens.backman@gmail.com> [Wed, 25 Jan 2012 08:48:52 +0100] rev 15978
i18n-sv: synchronized with c2e6c5ef4555
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2012 17:17:37 -0600] rev 15977
merge with i18n
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2012 17:16:29 -0600] rev 15976
copies: eliminate criss-crosses when chaining
Before the copies refactoring, we declared that if a and b were
present in source and destination, we ignored copies between them. The
refactored code could however report b was a copy of a and vice versa
in a situation where we looked for differences between two identical
changesets that copy a to b.
y
/
x
\
y'
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 23 Jan 2012 16:12:32 -0200] rev 15975
i18n-pt_BR: synchronized with f7c8d6ee6056