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