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

Re: Merging Branch to Trunk takes 20 min for one change

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 09 Oct 2009 21:42:36 +0200

On 08.10.2009 22:44, Dadeo wrote:
> Stefan - thanks for the info. I should have said we are using Google
> Code. I believe Google currently uses version 1.6.
>
> Afaik all merges have been done using Tortoise SVN via Windows
> Interface (right click,select Merge). However some may have been done
> prior to version 1.5. But I don't think we have ever removed merginfo
> properties.

Maybe you haven't, but maybe someone else on your team has?

> In the last merge I tried (from branch to trunk), many files appeared
> as modified, although diff shows no changes between the files. I read
> another post here about this issue which was related to version 1.5?
> Is that correct? I have not committed that merge to trunk yet. Should
> I? Or should I revert it and do the dump/load cycle first and then
> redo the merge?

how do you do the diff on those files? TSVN should show you a diff of
the properties if those have changed.
You can use the check-for-modifications dialog to check what exactly has
changed: right-click on the column header, then select "Text status" and
"Property status" to show those columns. If only the properties have
changed, you would see a status of "normal" in the "text status" column
but a "modified" on the "property status" column.

> Will a dump/load cycle correct all the above problems? And how do I
> ensure no one is removing mergeinfo properties?

I'm not sure if a dump/load will fix missing mergeinfos, but a dump/load
will improve the repository and make it access faster with 1.6 - an 1.6
server can still access 1.5 repositories, but it can do so faster with
the new format.
But if you're using Google code, you can't do a dump/load cycle since
you don't have direct access to the repo.

and unfortunately, there's no way to ensure that mergeinfo props are not
removed.

There's also a thread about the same issue on the svn mailing list:
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2405612

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2405654
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-09 21:42:44 CEST

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