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

Re: Merging file to file requires specifying source file by its URL

From: Branko Čibej <brane_at_apache.org>
Date: Fri, 30 Jun 2017 06:18:14 +0200

On 30.06.2017 06:04, Daniel Shahaf wrote:
> 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

Perhaps @WORKING? @HEAD refers to the repository, not the working copy.

-- Brane
Received on 2017-06-30 06:18:21 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.