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@HEAD CHANGES
Perhaps @WORKING? @HEAD refers to the repository, not the working copy. -- Brane
