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

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.

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