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

Re: 1.7.x - merge now accesses all files in WC?

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Thu, 2 Dec 2010 15:50:09 -0600

On Thu, Dec 2, 2010 at 3:43 PM, Daniel Becroft <djcbecroft_at_gmail.com> wrote:
> On Wed, Dec 1, 2010 at 7:34 PM, Philip Martin <philip.martin_at_wandisco.com>wrote:
>> > I can't see any reason why all these files would need to be accessed. I
>> seem
>> > to recall some discussion about preventing/warning merging into modified
>> > working copies, could this be the cause?
>> The new check is for a single revision working copy, not an unmodified
>> one.
> Ah, that makes more sense, I guess. Checking for an unmodified WC would mean
> that the ability to run consecutive 'svn merge -c' commands would be
> removed.

You can run 'svn merge -c17,85,90,123' if you need to merge multiple
revs in the same operation.

Received on 2010-12-02 22:50:49 CET

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.