[Svnmerge] 1.3.1 backports?

[Giovanni Bajo]

Hello,

since 1.3.1 is approaching, is there anything we may want to backport to it?
I'm sure there are quite a few fixes which are reasonable enough for 1.3.1. By
a quick inspection of the log:


r18634 | blair | 2006-02-27 20:11:20 +0100 (Mon, 27 Feb 2006) | 11 lines

Optimization fix for svnmerge.py to remove a stat() call.

r18618 | blair | 2006-02-25 00:49:01 +0100 (Sat, 25 Feb 2006) | 7 lines

Have svnmerge.py check for _svn directories to see if a directory is a
working copy.

r18651 | blair | 2006-03-01 06:38:13 +0100 (Wed, 01 Mar 2006) | 18 lines

Improved merge command performance by eliminating svn log operations
on phantom revisions.


r18345 | giovannibajo | 2006-02-04 19:12:32 +0100 (Sat, 04 Feb 2006) | 15 lines

In avail and merge, trim the range of search for phantom revisions with the
command-line specified revision list. Before this patch, svnmerge was always
trying to look for phantom revisions in head up to HEAD (last revision in
repository), which was too much and slowed down simple operations (like
merging a single revision) too much.

r18344 | giovannibajo | 2006-02-04 17:41:04 +0100 (Sat, 04 Feb 2006) | 7 lines

Fix a problem when parsing the output of "svn status" in a working copy
with external directories: there are blank lines in the output which were
confusing the code.

r18341 | giovannibajo | 2006-02-04 17:11:40 +0100 (Sat, 04 Feb 2006) | 8 lines

Fix the regular expression used to parse the XML produced by "svn log" to
extract the copy-from information: it was too broad and was allowing spurious
matches (eg. when used on the GCC repository).

r18013 | giovannibajo | 2006-01-07 18:36:59 +0100 (Sat, 07 Jan 2006) | 11 lines

Allow command line options to be specified in any order, even before the
command name. Eg. we now allow "svnmerge -r123 merge" which was forbidden
before.

r18011 | giovannibajo | 2006-01-07 18:15:29 +0100 (Sat, 07 Jan 2006) | 7 lines

Set properties using "-F" and a temporary file to avoid hitting command
line length limits.

r18010 | giovannibajo | 2006-01-07 17:53:15 +0100 (Sat, 07 Jan 2006) | 6 lines

Improve tree's copy-from revision extraction from "svn log --xml" output.
Avoid being fooled by copy-from information in single files.

r18009 | giovannibajo | 2006-01-07 17:47:50 +0100 (Sat, 07 Jan 2006) | 5 lines

Do not be fooled by external directories in the tree.


Comments? I'm sure some adjustments will be needed while merging...

Giovanni Bajo