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

Re: Question about merging

From: Dave Huang <khym_at_azeotrope.org>
Date: Tue, 15 Dec 2009 17:33:44 -0600

On 12/15/2009 4:11 PM, Ryan J Ollos wrote:
> David Huang-5 wrote:
>> So, I tried doing that, and I think it mostly worked, but a lot of files
>> were unexpectedly shown as "Updated"--I have no idea why they show up in
>> the
>> merge, since they haven't been modified between branch1 and branch1.1. It
>> seems to be harmless though; even though merge shows them as Updated,
>> they're not actually modified in the WC after the merge is done.
> Pay close attention to whether the files are shown as having text
> modifications or property modifications. It is very likely that just the
> mergeinfo or another property on the files has changed.

Both text modifications and property modifications will cause the file to be
flagged as modified (e.g., with the "modified" overlay icon, or since that's
not always reliable, in the "Check for modifications" window)--in this case,
the overlay remained the "normal" one, and Check for modifications confirmed
that neither the text nor properties were modified on many of the files
listed as "Updated".


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-16 00:33:52 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

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