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

Re: Merging a branch back to trunk produces more changes than previewed (commit would perform a LOT of changes)

From: Andy Levy <andy.levy_at_gmail.com>
Date: Wed, 23 Sep 2009 11:08:53 -0400

Resending to the mailing list. Please Reply to All to keep discussion on-list

On Wed, Sep 23, 2009 at 11:04, Stefan M. Huber <looseleaf_at_gmx.net> wrote:
> On Wed, 23 Sep 2009 16:32:56 +0200, Andy Levy <andy.levy_at_gmail.com> wrote:
>> On Wed, Sep 23, 2009 at 10:05, Stefan M. Huber <looseleaf_at_gmx.net> wrote:
>>> Hi!
>>>  I couldn't find an answer in the archives. Maybe also because I didn't
>>> find the right keywords.
>>> Here's the situation:
>>> I have a trunk from which I branched off. I changed some files in the
>>> branch.
>>> After updating both branch and trunk to the most current revision, I
>>> wanted to merge the branch back into the trunk (using TortoiseSVN):
>>> The test merge showed about 10 files to be updated in the trunk.
>>> I executed the merge and the 10 files were updated. The merge took very
>>> long.
>>> Afterwards, I noticed, that a lot of files (nearly every versioned file)
>>> was marked as changed. Indeed, a revert preview or a commit preview would
>>> change nearly every file. Although they have not been changed.
>> What type of change? Content or properties? You're likely seeing the
>> svn:mergeinfo properties being changed.
> Ahem, there are no content changes, that's true. It's just that TortoiseSVN
> wants to commit a lot of files.

You need to look at *what* those changes are that are being committed.
There are 2 types of changes - content, and properties. In the TSVN
Commit window, there will be 2 columns in the bottom pane that
indicate this - Text Status (content changes) and Property Status.

If the content hasn't changed, Text Status will show "normal", if it
has changed, it will show "modified". Same goes for Property Status.

As I stated above, it's likely that the svn:mergeinfo property is
changed (which will be indicated by Property Status showing
"modified"), and THAT is the change that TSVN wants to commit.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-23 17:09:42 CEST

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

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