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

merging a patch

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: 2005-04-29 16:22:54 CEST


Just wondering, but is there a way to merge a patch into a working copy? The
reason I ask is that I want to merge a few changes from one repository into a
different repository, but haven't found a way to do that yes.

My approaches were:
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.
2. Use good old unix pipes: 'svn diff -rX:Y svn://repos1/path|patch -p0'. This
works, but newly created files are not added to subversion that way.
3. Using svn_load_dirs. The problem with this approach is that it is way too
specialised for tracking external sources and that you can't specify a
comment for the commit (if it turns out to be just one, which I'm sure it
would be for my case).
4. svnadmin dump/load. This unfortunately requires direct repository access,
which is why this is not an ideal solution for me. Other than that, this is
almost the perfect match for my problem, I just need to copy a few revisions
for one repository over to another.

An idea I got along the way was to use 'svn merge' by piping in a patch, like
'svn diff -rX:Y svn://repos1/path|svn merge - .' but that is not supported.
Interesting addition?

Another odd thing I noticed is that you can't merge anything in a non-working
copy. Trying that, subversion says
  svn: Use --force to override this restriction
  svn: 'foo' is not under version control
but no matter where I put the '--force', svn refuses cooperation. Also, the
order of these two lines is odd, it makes me wonder what 'this' in the first
line refers to.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 2 08:21:03 2005

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.