Tobias Ringstrom <tobias@ringstrom.mine.nu> writes:
> pll@lanminds.com wrote:
>
> >I've tried merge, but I think I'm screwing that up too:
> >
> > svn merge -r 35:48 ./wiki.pl .
> > svn: RA layer request failed
> > svn: REPORT request failed on /svn/centera_web/trunk/cgi-bin/wiki.pl
> > svn: The REPORT request returned invalid XML in the response: Unknown XML\
> > element `error (in DAV:)'. (/svn/centera_web/trunk/cgi-bin/wiki.pl)
> >
> > So, how to I get a file in my wc (which is at rev 48) back to the
> > file I had in rev 35? :)
> >
> I think this is the same problem I had yesterday. Basically you cannot do
>
> svn merge -r 35:48 wiki.pl
>
> but you have to do
>
> svn merge -r 35:48 wiki.pl wiki.pl
>
> Is that a bug?
Technically, it's not a bug. The UI for merge has *always* required
two sources and a target, either 3 files or 3 dirs. So in the broken
example, you're asking to merge the diffs between two files into an
implicit '.' target.... hence the error.
The only error here is a UI that could be more friendly. This is
issue #785, and Brian Denny just submitted a patch to fix it. It will
be applied to /trunk very soon!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 14 15:45:52 2003