Julian Foad wrote:
> Hi Mike.
> 
> I reviewed r939375,r939376 proposed for back-port to 1.6.x, to fix issue
> #3623 "Files added via merge from foreign repositories lose properties"
> <http://subversion.tigris.org/issues/show_bug.cgi?id=3623>.
> 
> The fix looks fine and works properly, and I'll approve it.
> 
> Just a small concern about r939375 which extends the existing test
> function (merge_tests 88 on 1.6.x, merge_tests 72 on current trunk).  It
> looks like it unintentionally removes a check.  See the "-" line in the
> diff below?

That check was removed intentionally as a minor optimization.  While it's
fine to verify the disk tree at the point the test, the whole reason I
needed to extend the test was that successful verification at that stage
wasn't enough to verify that the bug was fixed.  So I had the test do more
work and delayed disk verification until later.  But it's fine with me if
you want to reinstate it.

-- 
C. Michael Pilato <cmpil...@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to