[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: object01 <object01_at_gmail.com>
Date: Wed, 27 Aug 2008 10:08:10 -0700 (PDT)

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
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.

Jeff S.
View this message in context: http://www.nabble.com/BUG%3A-Record-Only-Merge-modified-Working-Copy-tp18225002p19185368.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-27 19:08:19 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.