Patrick Mezard <patrick@mezard.eu> [Sun, 29 Apr 2012 22:25:55 +0200] rev 16551
localrepo: add setparents() to adjust dirstate copies (issue3407)
The fix introduced in eab9119c5dee was only partially successful. It is correct
to turn dirstate 'm' merge records into normal/dirty ones but copy records are
lost in the process. To adjust them as well, we need to look in the first
parent manifest to know which files were added and preserve only related
records. But the dirstate does not have access to changesets, the logic has to
moved at another level, in localrepo.
Patrick Mezard <patrick@mezard.eu> [Sun, 29 Apr 2012 16:18:46 +0200] rev 16550
test-rebase-parameters: more tests for revset/opts
- --source and revset
- --base and revset
- --rev and revset
- --rev and --source combination
- --rev and --base combination
Martin Geisler <mg@aragost.com> [Mon, 30 Apr 2012 12:45:44 +0200] rev 16549
help/config: expand [subpaths] help
Brifly explain why rewriting subrepository paths can be necessary.
Explain that relative subrepository paths are made absolute before
rewrite rules are applied.
Martin Geisler <mg@aragost.com> [Mon, 30 Apr 2012 12:04:30 +0200] rev 16548
doc: update copyright years to 2012
I sometimes look at a piece of software and if the man page says
"Copyright 2004", then I'm inclined to think that the project is stale
or that the authors are lazy. Neither is good publicity for us :-)
Martin Geisler <mg@aragost.com> [Mon, 30 Apr 2012 11:51:24 +0200] rev 16547
help: consistently use title capitalization for help topics
Matt Mackall <mpm@selenic.com> [Sat, 28 Apr 2012 16:38:07 -0500] rev 16546
merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Sat, 28 Apr 2012 14:15:43 -0300] rev 16545
i18n-pt_BR: synchronized with e37199a1f9d4
Wagner Bruna <wbruna@yahoo.com> [Sat, 28 Apr 2012 13:22:52 -0300] rev 16544
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 29 Apr 2012 00:48:22 +0900] rev 16543
i18n-ja: synchronized with 4bce649a2b0f
Patrick Mezard <patrick@mezard.eu> [Sat, 28 Apr 2012 20:29:21 +0200] rev 16542
dirstate: preserve path components case on renames (issue3402)
The original issue was something like:
$ hg init repo
$ cd repo
$ mkdir D
$ echo a > D/a
$ hg ci -Am adda
adding D/a
$ mv D temp
$ mv temp d
$ echo b > d/b
$ hg add d/b
adding D/b
$ hg ci -m addb
$ hg mv d/b d/c
moving D/b to d/c
$ hg st
A d/c
R D/b
Here we expected:
A D/c
R D/b
the logic being we try to preserve case of path components already known in the
dirstate. This is fixed by the current patch.
Note the following stories are not still not supported:
Changing directory case
$ hg mv D d
moving D/a to D/D/a
moving D/b to D/D/b
$ hg st
A D/D/a
A D/D/b
R D/a
R D/b
or:
$ hg mv D/* d
D/a: not overwriting - file exists
D/b: not overwriting - file exists
And if they were, there are probably similar issues with diffing/patching.