You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Andy Levy <an...@gmail.com> on 2009/09/23 14:32:56 UTC
Re: Merging a branch back to trunk produces more changes than
previewed (commit would perform a LOT of changes)
On Wed, Sep 23, 2009 at 10:05, Stefan M. Huber <lo...@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.
What version of TSVN on your desktop & SVN on your server?
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2398905
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Merging a branch back to trunk produces more changes than
previewed (commit would perform a LOT of changes)
Posted by "Stefan M. Huber" <lo...@gmx.net>.
On Wed, 23 Sep 2009 16:32:56 +0200, Andy Levy <an...@gmail.com> wrote:
> On Wed, Sep 23, 2009 at 10:05, Stefan M. Huber <lo...@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.
>
> What version of TSVN on your desktop & SVN on your server?
Client ("about" window of TortoiseSVN):
TortoiseSVN 1.6.5, Build 16974 - 32 Bit , 2009/08/20 08:13:46
Subversion 1.6.5,
apr 1.3.8
apr-utils 1.3.9
neon 0.28.6
OpenSSL 0.9.8k 25 Mar 2009
zlib 1.2.3
Server:
svn --version
1.5.3 (r33570)
I will upgrade the server to the most common release today.
--
Austrolektran at work
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2399209
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Merging a branch back to trunk produces more changes than
previewed (commit would perform a LOT of changes)
Posted by Andy Levy <an...@gmail.com>.
On Thu, Sep 24, 2009 at 05:45, Stefan M. Huber <lo...@gmx.net> wrote:
> On Wed, 23 Sep 2009 17:08:53 +0200, Andy Levy <an...@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@subversion.tigris.org].
Re: Merging a branch back to trunk produces more changes than
previewed (commit would perform a LOT of changes)
Posted by "Stefan M. Huber" <lo...@gmx.net>.
On Wed, 23 Sep 2009 17:08:53 +0200, Andy Levy <an...@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.
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?
Thanks so far,
Stefan
--
Austrolektran at work
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2399210
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Merging a branch back to trunk produces more changes than
previewed (commit would perform a LOT of changes)
Posted by Andy Levy <an...@gmail.com>.
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 <lo...@gmx.net> wrote:
> On Wed, 23 Sep 2009 16:32:56 +0200, Andy Levy <an...@gmail.com> wrote:
>
>> On Wed, Sep 23, 2009 at 10:05, Stefan M. Huber <lo...@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.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2398938
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].