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

Re: Problems with merging against 1.4.x repository

From: Kari Granö <kari.grano_at_elisanet.fi>
Date: Sun, 15 Jun 2008 13:39:48 +0300

Hi Stefan,

> Can you try instead of using the log dialog to select the revisions to
> merge entering the revision range manually?

Bingo! Not full success, but much improvement. Entering single rev range
that embeds all the gaps has dramatic effect on the merge speed and
correctness:

Approach 1: TSVN 1.5-RC3 (32-bit)
- run merge wizard, first merge style option
- enter revision range manually with gaps, e.g. "10142-10451"
- otherwise accept defaults (click "non-interactive" immediately when the
merge starts)

Result 1:
- merge window reports single range for the merge
- individual merges much faster than before
- merge runs successfully to the end
- total time reported by TSVN: 9 min 15 sec

Approach 2: SVN rc9 command-line client (32-bit)
- "svn merge -r10142:10451 --accept postpone URL"

Result 2:
- merge runs successfully to the end
- total time 40 seconds

Approach 3: TSVN 1.5-RC3 (32-bit)
- run merge wizard, first merge style option
- enter revision range with "Show Log" button, paint range "10142-10451"
- otherwise accept defaults (click "non-interactive" immediately when the
merge starts)

Result 3:
- merge window reports every merge subrange (there are about 60 subranges)
- individual merges very slow
- after 27 submerges, the merge got confused: it *restarted* with the second
subrange (r10145-10146; the first subrange is 10141-10142). This of course
resulted in conflicts for every repeated submerge.
- finally, after 14 re-applied submerges the merge failed with error
Error: In directory 'd:\va88\uit\libs'
Error: Error processing command 'append' in 'd:\va88\uit\libs'
Error: Missing 'dest' attribute in 'd:\va88\uit\libs'
Error: Error reading spooled REPORT request response

So I think there are two issues: a) general slowness problem when compared
with the CL client b) correctness problem when there are many subranges
within the merge.

I will later try the multiple-subrange merge with the CL client, if
possible.

HTH,
Kari

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-06-15 12:40:39 CEST

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