[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 18:11:26 +0200

object01 wrote:
> But the operation does modify the contents of the files. My working copy is
> filled with all the left/right files you'd expect to see result from the
> conflict, and my source files contain the "<<<<<<"/">>>>>>" annotations that
> normally result from a conflict. Plus, new files appear and deleted files
> are removed. It's my understanding that in an "Only record the merge"
> scenario, none of these modifications should occur; only the relevant
> svn:mergeinfo properties should be added/updated.

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

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

Received on 2008-08-27 18:11:50 CEST

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