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

Re: merging a patch

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: 2005-05-03 09:54:06 CEST

Scott Palmer wrote:
> On May 2, 2005, at 10:46 AM, Ben Collins-Sussman wrote:
> > On Apr 29, 2005, at 9:22 AM, Ulrich Eckhardt wrote:
> >> 1. From inside a workingcopy, do 'svn merge -rX:Y svn://repos1/
> >> path .' or the
> >> equivalent using a URL. This yields 'Access schema mixtures not yet
> >> supported' from subversion, although it seems to patch at least
> >> one file. I
> >> believe that is a bug.
> >
> > If it does anything at all, it's a bug. It should give you an
> > error about the working copy repository being different than the
> > repository URLs you're comparing.
>
> Huh? Isn't that the normal way of merging changes from one branch to
> another?

The relevant pieces of context are missing from above quotes, but the
important difference is that the changes are coming from one repository and
are merged into a different(!) repository.

Uli

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 3 09:54:53 2005

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