[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Useless explicit mergeinfo records

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Wed, 27 Aug 2008 11:43:09 -0400

Danil Shopyrin wrote:
> 2) Mergeinfo produced during WC-to-WC copy differs from equivalent
> REPO-to-REPO copy. If you copy file in working copy and there is no
> mergeinfo in the working copy then the new file will get an empty
> mergeinfo record. Similar REPO-to-REPO copy operation doesn't produce
> empty mergeinfo record.
> This problem was already discussed here:
> http://svn.haxx.se/users/archive-2008-08/0471.shtml

That's correct. A WC-to-WC copy isn't allowed to speak to the repository,
so it doesn't have the opportunity to verify that "no mergeinfo" is the
correct result. To be safe, it sets empty mergeinfo (to block any
inheritence it couldn't have foreseen due to lack of repository access). As
you note below, though, there are some cases when we can be smarter about this.

> 3) Unnecessary mergeinfo records are produced on copy operations. If
> user plainly renames file1.txt to file2.txt in the same folder then
> file2.txt gets explicit merge even if file1.txt didn't have one. In
> agile environments file renaming is performed very often and this
> result in whole working copy filled by unnecessary mergeinfo records.
> This slows down merge operation dramatically.

We agree. I thought there was an issue for this already, but I can't find
it. In general, the behavior should be: Figure out what the mergeinfo for
the target would be, and if it's no different than the mergeinfo for the
source location, don't set/change it.

C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-08-27 17:43:26 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.