Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 15:30:39 +0100] rev 13542
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 15:21:50 +0100] rev 13541
Improve unresolved merge conflicts warning (issue2681)
Suggested by Antoine Pitrou <pitrou@free.fr>
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:38:47 +0100] rev 13540
tests: convert test-serve to new format
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:19:57 +0100] rev 13539
run-tests: handle mixed comment lines in blacklists
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:17:47 +0100] rev 13538
test-doctest: handle unix/windows path discrepancies
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 10:06:09 +0100] rev 13537
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
Matt Mackall <mpm@selenic.com> [Sat, 05 Mar 2011 16:34:59 -0600] rev 13536
merge: drop resolve state for mergers with identical contents (issue2680)
Matt Mackall <mpm@selenic.com> [Fri, 04 Mar 2011 19:21:36 -0600] rev 13535
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 04 Mar 2011 19:21:12 -0600] rev 13534
match: ignore "" patterns
The following command would visit every changeset in repo/ rather than
the last 10:
hg log -l 10 repo/
Adrian Buehlmann <adrian@cadifra.com> [Fri, 18 Feb 2011 01:19:01 +0100] rev 13533
statichttprepo: abort if opener mode is 'r+' or 'rb+'
The old version of the check failed to catch
modifying modes 'r+' and 'rb+'.
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Mar 2011 14:11:15 +0100] rev 13532
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Mar 2011 14:00:49 +0100] rev 13531
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.