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

Merging file to file requires specifying source file by its URL

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Fri, 30 Jun 2017 04:04:33 +0000

I'm trying to merge trunk/CHANGES into branches/1.9.x/CHANGES. I have
two separate working copies: the current directory (./) is a working
copy of branches/1.9.x and ../wc-of-trunk is a working copy of /trunk.
When I try the sync merge syntax with file targets, I get an error:
    $ svn merge ../wc-of-trunk/CHANGES_at_HEAD CHANGES
    subversion/svn/merge-cmd.c:54: (apr_err=SVN_ERR_CLIENT_BAD_REVISION)
    svn: E195002: Invalid merge source 'CHANGES'; a working copy path can only be used with a repository revision (a number, a date, or head)
I get that error whether or not I pass the @HEAD peg revision on the
source argument.

If I pass -r HEAD, I get a different error:
    $ svn merge -r HEAD ^/subversion/trunk/CHANGES CHANGES
    subversion/svn/svn.c:3097: (apr_err=SVN_ERR_CL_INSUFFICIENT_ARGS)
    svn: E205001: Try 'svn help merge' for more information
    subversion/svn/merge-cmd.c:357: (apr_err=SVN_ERR_CL_INSUFFICIENT_ARGS)
    svn: E205001: Second revision required
I get that error even if I change the source argument to a local path.

The odd thing is that if I take the original command, and replace the
source argument by its URL, it works:
    $ svn merge ^/subversion/trunk/CHANGES CHANGES
    --- Merging r1771273 through r1800349 into 'CHANGES':
    --- Recording mergeinfo for merge of r1771273 through r1800349 into 'CHANGES':

So: how can I do a sync merge of file targets without specifying the
full URL of the source?

I'm using a 1.10-dev client.


Received on 2017-06-30 06:04:40 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.