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

Re: merge problem with Tortoise

From: Nemesis <nemesis199_at_hotmail.com>
Date: Fri, 31 Jul 2009 13:00:21 -0700 (PDT)

Stefan,

What do you mean exactly with "subsequent merges will take longer than
necessary"? Do you mean that Tortoise will be slower when merging the
next merges, or is it that it will be slower because each time the
person making the merge will have to revert manually each mergeinfo
added? I'm asking because I have the same "problem" as Ilan. If
reverting the mergeinfo of the files can have a negative impact on the
performance of Tortoise maybe I'll think twice about doing that.

Thanks!

On Jul 30, 11:36 am, Stefan Küng <tortoise..._at_gmail.com> wrote:
> On 30.07.2009 08:42, Ilan Yaniv wrote:
>
> > Hi all,
>
> > We have a merge problem. When we are merging a revision from one branch
> > to the trunk and selecting one file to merge in fact a bunch of files
> > get merge, and then we have to make a revert to the files that we don’t
> > want to merge.
>
> > We have Tortoise 1.6.3 installed, with latest SVN server.
>
> > Why is this happening?
>
> I guess the other files are not really merged but only get the
> svn:mergeinfoproperty set. You can of course revert those properties if
> you like, but then subsequent merges will take longer than necessary.
>
> 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&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2377536

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-07-31 22:00:48 CEST

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.