test-rename-merge1: make it easier to review, windows friendly
- Reuse the coding style of the previous tests, both are very similar
- Do not play with case changes, it does not work on Windows
merge: drop resolve state for mergers with identical contents (
issue2680)
match: ignore "" patterns
The following command would visit every changeset in repo/ rather than
the last 10:
hg log -l 10 repo/
statichttprepo: abort if opener mode is 'r+' or 'rb+'
The old version of the check failed to catch
modifying modes 'r+' and 'rb+'.
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant but it is much simpler than rewriting our own
purge command for subversion.