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

Re: BUG: Record Only Merge modified Working Copy

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 27 Aug 2008 19:43:56 +0200

object01 wrote:
> Stefan Küng wrote:
>> Hmm - the 'reintegrate merge' API doesn't support the 'record only'
>> flag. Which means that it will always execute the merge.
>> I think I'll have to deactivate that checkbox in case of a reintegrate
>> merge.
>> Stefan
> Hm. I can't see a reason why reintegration (a special case of "merge
> revision ranges", right?) couldn't support that option.
> This issue has been raised in the Subversion Users list
> (http://www.nabble.com/Re%3A-svn_client_merge_reintegrate%28%29---API-concerns-p15694693.html),
> and seemed to be dismissed pretty quickly. But isn't this really a
> necessary feature?
> Seemed to me like reintegration is the quickest way to sync a branch to the
> trunk (i.e. make the branch "caught up to" the trunk), and conflicts like
> the kind I'm experiencing are not suited for automated merge algorithms.
> It's much faster for me to manually resolve the conflicts and use features
> like --record-only to do the appropriate bookkeeping.

You don't have to tell me that :)
If you want this feature, you have to convice the svn developers to
implement it.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-08-27 19:44:17 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.