Edouard Gomez <ed.gomez@free.fr> [Sat, 06 Jun 2009 00:08:37 +0200] rev 8764
convert: default to file protocol when no :// found for svn repo url
Edited by pmezard: add path separator normalization
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:34 -0400] rev 8763
keyword: improve English
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:25 -0400] rev 8762
bookmarks: improve English
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:17 -0400] rev 8761
Generally replace "file name" with "filename" in help and comments.
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:31 -0400] rev 8760
Spell Mercurial as a proper noun
Matt Mackall <mpm@selenic.com> [Tue, 09 Jun 2009 11:55:32 -0500] rev 8759
win32text: drop disabling portion of test
disabling extension leaves dirstate confused about whether affected
files are clean or not, not much point testing it.
Tobias Bell <tobias.bell@gmail.com> [Mon, 08 Jun 2009 20:09:48 +0200] rev 8758
i18n-de: Synchronised with hg.pot
translated by Fabian Kreutz <fabian.kreutz@qvantel.com>
Tobias Bell <tobias.bell@gmail.com>
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 09 Jun 2009 11:49:16 -0300] rev 8757
i18n-pt_BR: synchronized and updated
- synchronized with hg 6019e6517f95
- translated remaining messages
- many spelling and formatting fixes
Henrik Stuart <hg@hstuart.dk> [Tue, 09 Jun 2009 08:59:49 +0200] rev 8756
convert: better support for CVS branchpoints (issue1447)
This records the branches starting at individual CVS file revisions,
using the symbolic names map rather than just the branches
information. This information is used to generate Mercurial
changesets. Despite the changes, the CVS conversion still suffers
heavily from cvsps' deficiencies in generating a correct
representation of the CVS repository history.
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:21:13 -0500] rev 8755
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:16:32 -0500] rev 8754
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8753
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8752
merge: simplify file revision comparison logic
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8751
merge: make locally-added file test more correct
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8750
merge: drop unused diverge initialization
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8749
merge: refactor some initialization, drop backwards var
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8748
merge: combine a copy and move case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8747
merge: drop a flag update case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8746
merge: combine three identical 'remote is newer' cases
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8745
merge: drop 'remote deleted' case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8744
merge: simplify 'other deleted' case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8743
merge: simplify backwards revert test, ready to combine with other cases
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8742
merge: allow merging going backwards
New behavior is generally superior and more correct, except possibly
with regards to missing files. hg up . is now effectively a no-op,
which is probably the desired behavior for people expecting to move to
tip, but may surprise people who were expecting deleted files to
reappear.
case 1: update to .
a-w -> a-w
classic: ancestor a
missing recreated right?
rmed recreated WRONG
added forgotten WRONG
changed preserved RIGHT
conflicted can't happen
backward merge: ancestor a (NO EFFECT)
missing missing wrong?
rm'ed rm'ed RIGHT
added preserved RIGHT
changed preserved RIGHT
conflicted can't happen
case 2: update to ancestor of .
a-b-w -> b-w
\
a
classic: ancestor a
missing recreated right?
rmed recreated wrong?
added forgotten wrong?
changed preserved RIGHT
conflicted preserved wrong?
backwards merge: ancestor b
missing missing or conflict right?
rm'ed missing or conflict right?
changed preserved RIGHT
conflicted merge RIGHT
added preserved right?
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8741
merge: reorder remote creation tests
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8740
merge: drop recreating case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8739
merge: drop an overwrite test
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8738
merge: simplify a delete case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8737
merge: reorder get cases for future simplification
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8736
merge: fix prompt keep
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8735
merge: remove a flags case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8734
merge: pretend ancestor is local to simplify backwards and overwrite
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8733
merge: simplify flag merging code slightly
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8732
dirstate: eliminate reference cycle from normalize
Bound methods hold a reference to self, so assigning a bound method to
an instance unavoidably creates a cycle. Work around this by choosing
a normalize method at walk time instead. Eliminate default arg while
we're at it.
Henri Wiechers <hwiechers@gmail.com> [Sun, 07 Jun 2009 21:16:05 +0200] rev 8731
cleanup: removed unused imports
Martin Geisler <mg@lazybytes.net> [Mon, 08 Jun 2009 00:14:24 +0200] rev 8730
hgrc.5: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net> [Mon, 08 Jun 2009 00:13:58 +0200] rev 8729
hgignore.5: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net> [Mon, 08 Jun 2009 00:13:35 +0200] rev 8728
hg.1: wrap lines at 70 chars (whitespace cleanup)
timeless <timeless@gmail.com> [Sun, 07 Jun 2009 17:34:12 +0200] rev 8727
hgrc.5: language fixes
Christian Ebert <blacktrash@gmx.net> [Mon, 01 Jun 2009 02:17:57 +0200] rev 8726
hgrc.5: wrap manpage at 80 chars
Checked with asciidoc 8.4.5
Abderrahim Kitouni <a.kitouni@gmail.com> [Thu, 04 Jun 2009 21:24:29 +0100] rev 8725
bookmarks: update docstring
Brendan Cully <brendan@kublai.com> [Sat, 06 Jun 2009 15:38:03 -0700] rev 8724
Unbreak run-tests support for out-of-tree extensions
Brendan Cully <brendan@kublai.com> [Sat, 06 Jun 2009 13:37:41 -0700] rev 8723
Merge with crew-stable
Arne Babenhauserheide <bab@draketo.de> [Fri, 05 Jun 2009 15:08:45 +0200] rev 8722
Some platforms lack the PATH_MAX definition (eg. GNU/Hurd).
Thanks to ronny for making it cleaner.
Will Maier <willmaier@ml1.net> [Thu, 04 Jun 2009 18:11:11 -0600] rev 8721
test-fncache: Use find instead of ls -R.
Different platforms implement -R differently (and it produces
unneccessarily verbose output in this case). find is just as
good and more consistent. Unbreaks test on OpenBSD.
Edited by pmezard: added 'sort' call
Will Maier <willmaier@ml1.net> [Thu, 04 Jun 2009 17:33:30 -0600] rev 8720
Make test-verify SUSv3 compatible.
'head -c' isn't supported on (at least) OpenBSD and is not
part of SUSv3. Instead, use dd.
See also:
http://www.opengroup.org/onlinepubs/009695399/utilities/head.html
Steve Losh <steve@stevelosh.com> [Wed, 03 Jun 2009 22:58:43 -0400] rev 8719
Support branch names in contrib/bash_completion
Anywhere a revision is needed a branch name can be used to specify
the tip of that branch, so branch names should be tab completed.
Steve Losh <steve@stevelosh.com> [Wed, 03 Jun 2009 22:54:53 -0400] rev 8718
Support merge in contrib/bash_completion
Matt Mackall <mpm@selenic.com> [Thu, 04 Jun 2009 16:21:55 -0500] rev 8717
context: add a dirty method to detect modified contexts
Matt Mackall <mpm@selenic.com> [Thu, 04 Jun 2009 16:21:09 -0500] rev 8716
dirstate: don't complain about 0-length files
Matt Mackall <mpm@selenic.com> [Thu, 04 Jun 2009 16:21:03 -0500] rev 8715
commit: move some setup outside the lock
Shun-ichi GOTO <shunichi.goto@gmail.com> [Thu, 04 Jun 2009 21:23:31 +0900] rev 8714
Add cp950 as problematic encoding which is used in chinese windows.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 04 Jun 2009 18:05:50 +0200] rev 8713
hgweb: allow distinction between open/closed branches on branches page
Matt Mackall <mpm@selenic.com> [Wed, 03 Jun 2009 17:12:48 -0500] rev 8712
commit: rename wctx to cctx
Matt Mackall <mpm@selenic.com> [Wed, 03 Jun 2009 17:07:41 -0500] rev 8711
mq: fix commit prototype
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 22:13:08 -0500] rev 8710
commit: trade O(n^2) file checks for O(n^2) dir checks
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 21:51:00 -0500] rev 8709
commit: move explicit file checking into repo.commit
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 20:25:01 -0500] rev 8708
dirstate: more accurate use of match.dir callback
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 14:51:47 -0500] rev 8707
commit: editor reads file lists from provided context
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 14:11:32 -0500] rev 8706
commit: drop the now-unused files parameter
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 14:11:19 -0500] rev 8705
tag: use match.exact for commit