subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Thorsten Schöning <tschoen...@am-soft.de>
Subject Re: SVN client crashdump
Date Wed, 17 Jul 2013 06:52:19 GMT
Guten Tag John Sturton,
am Montag, 15. Juli 2013 um 16:01 schrieben Sie:

Please don't just send attachments to the list without any textual
description or body, they make life unnecessary hard for people
willing to help you. At least copy the contents of the attachments to
the body for easier quotation etc.

> Cmd line: "C:\Program Files (x86)\SlikSvn\bin\svn"  merge --reintegrate http://svn.wncdev.sescoi.macon:81/svn-private/wnccam/wncsrc/wzaccess/branches/WORKNC_V22
cwncvarsinkutils.cpp

I'm not sure, but regarding the help --reintegrate has to be used on
branches, not files and it looks to me you switched source and rev. Or
do you want to merge directory/branch changes onto a file? You
shouldn't do that, if the source is  a directory/branch, you should
merge to a directory/branch.

svn merge SOURCE[@REV] [TARGET_WCPATH]

Mit freundlichen Grüßen,

Thorsten Schöning

-- 
Thorsten Schöning       E-Mail:Thorsten.Schoening@AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/

Telefon...........05151-  9468- 55
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04

AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow


Mime
View raw message