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

Re: [TSVN] Error when merging

From: Colin Hartnett <colinhartnett_at_hotmail.com>
Date: 2005-08-14 09:27:23 CEST

>No idea. My crystal ball is not working properly.

I was hoping you could at least clarify what the error meant because there's
nothing about file nodes and checksums in the manual
(http://tortoisesvn.berlios.de/?q=node/133), and my crystal ball is in the
shop as well.

>We need much more information:
>- what URL's/revisions did you enter in the merge dialog
>- where was the branch created
>- what command did you use with the CL client (which works)

I tried multiple revisions. I tried about every variation of the merge
command possible. I tried it on multiple repositories. It just doesn't work,
at all, with my machine and server.

I created a basic text file in trunk, checked it in, created a branch with
svn copy svn://repos/trunk svn://repos/branches/a (r15), added a line to the
end of the text file in the branch, checked that in (r16), then tried to
merge them:

svn merge -r15:16 svn://repos/branches/a svn://repos/trunk

The repos is an FSFS running 1.2.1. My TSVN is the latest released version
(not the nightly).

The diff button works fine, and tortoise leaves behind a 0kb tmp file in the
target directory every time I push the merge button.

Colin.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Aug 14 09:27:41 2005

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