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

On Thu, Sep 24, 2009 at 05:45, Stefan M. Huber <looseleaf_at_gmx.net> wrote:
> On Wed, 23 Sep 2009 17:08:53 +0200, Andy Levy <andy.levy_at_gmail.com> wrote:
>
>> 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.
>
> Property status; I never realized that there's a difference.

If there wasn't a difference, there wouldn't be a need for a separate column.

> Do you have an explanation, why some files and folders are not changed? I do
> have one directory with one file in it which would not be changed.
> The TSVN>Properties window does not list any entries. It should, shouldn't
> it?

There is a bug in the early 1.5 releases of Subversion which generates
spurious svn:mergeinfo changes. I don't recall if it was a server or
client side issue though.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2399271

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-24 14:46:48 CEST