Re: Problems with merging against 1.4.x repository

Hi Stefan,

Due to unrelated issues, I haven't had the time to really try out your
suggestions. However, it seems that there is some difference in
functionality between the command-line client and TSVN.

- I've verified that our SVN server is using neon

- I've installed te rc9 command-line client and performed the command "svn
merge -r10142:10451 --accept postpone URL"
This command took about one minute to complete, and it ran without errors. I
did it twice (reverting in between, of course) and got the same result.

- I installed the TSVN-RC3 (32 bit) but had trouble integrating it into
64-bit explorer. So I gave the command

c:\Program Files (x86)\TortoiseSVN\bin\tortoiseproc /command:merge
/path:\path\to\wc

and selected the first merging option, range 10142-10451 (otherwise default
options) and clicked "merge". This operation was noticeably slower than the
command-line version. When the first conflict popped up, I selected
"postpone all" (or something like that). After 10 minutes of merging, the
command failed with

Merging r10250 through r10253: d:\va88
[...]
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

However, it did not crash :-(. I did not have time for further testing, but
it would seem that the command-line client is doing something else than
TSVN. Or maybe my command-line does not equal the TSVN merge command?

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-13 19:16:39 CEST