[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: SteveKing <steveking_at_gmx.ch>
Date: 2005-08-14 10:02:34 CEST

Colin Hartnett wrote:

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

The error message comes from the Subversion library, not TSVN.
But "Attempted to get checksum of a *non*-file node" indicates that you
tried to execute a command on a folder where a file was expected.
Did you perhaps set one URL pointing to a folder and the other to a file
when you tried merging?

> 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

I assume that merge command with the CL client works?

If you do that with TSVN, you have to:
- enter svn://repos/branches/a in the "From: (start URL and revision of
the range to merge)" box. Revision 15 in the edit box just below that.
- enter svn://repos/trunk in the "To: (end URL and revision of the range
to merge)" box. To activate that box, uncheck "Use From: URL" first.
Then enter 16 in the Revision box just below that.

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

The 0kb tmp file is created and handled by the Subversion library. If
it's left behind, then something is wrong. Maybe you have a virus
scanner running which locks every newly created file? Some of them do
that and so prevent the app that created those files from using them
again! Configure your virus scanner to exclude your working copies from
scanning.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Aug 14 10:02:52 2005

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