convert: avoid querying log of foreign svn branches
Server configuration may prevent access to other branches, so don't even try to
get them, instead of ignoring them afterwards.
patch: check filename is /dev/null for creation or deletion (issue 1033)
Otherwise, file creation or deletion is ambiguous with file being filled or
emptied.
copies: add tests for status -C/diff --git
This goes through 42 combinations of copy/rename branch/parent/working dir.
copies: deal with symmetric difference for linear relationships
choose the minimum of symmetric difference and the two revs in question
copies: move findcopies code to its own module
- pass in contexts
- fold symmetricdifference check into copies.copies
merge: notice uncommited copies (
issue1000)
As mentioned in msg5349 in
issue988, "hg update" doesn't take into account
uncommitted copies. To reproduce:
----------------
hg init repo
cd repo
touch foo
hg ci -Am 'add foo'
echo >> foo
hg ci -m 'change foo'
hg up -C 0
hg mv foo bar
HGMERGE=false thg --debug -y update
--------------------------
A similar problem happens with hg merge --force.
I'm attaching a possible patch.
hook.py: fix redirections introduced by
323b9c55b328
The only non-obvious part is the use of sys.{__stderr__,__stdout__},
which is needed because sshserver overrides sys.stdout.
This makes a test that I added back in revision
7939c71f3132 ineffective.