Branko Čibej wrote on Fri, 30 Jun 2017 06:18 +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@HEAD CHANGES > > Perhaps @WORKING? @HEAD refers to the repository, not the working copy.
What would that mean? foo@WORKING would include any local mods to foo, and those are not representable in svn:mergeinfo. That said, I gave it a try: $ svn merge ../wc-of-trunk/CHANGES@WORKING CHANGES subversion/svn/merge-cmd.c:318, subversion/libsvn_subr/opt.c:832: (apr_err=SVN_ERR_CL_ARG_PARSING_ERROR) svn: E205000: Syntax error parsing peg revision 'WORKING' If I force it to use svn_opt_revision_working, I get the previous error again: $ …/subversion/svn/svn merge ../wc-of-trunk/CHANGES@WORKING CHANGES subversion/svn/merge-cmd.c:405, subversion/svn/merge-cmd.c:54: (apr_err=SVN_ERR_CLIENT_BAD_REVISION) svn: E195002: Invalid merge source '../wc-of-trunk/CHANGES'; a working copy path can only be used with a repository revision (a number, a date, or head) Cheers, Daniel
