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

Vendor branches vs. svn merge (across repositories) - almost

From: Ingo Zitzmann <i.zitzmann_at_gmail.com>
Date: Mon, 8 Sep 2008 14:18:38 +0200

Hi all,

i went through the open issues tracker
http://subversion.tigris.org/issues/buglist.cgi looking for merge and add.
Also I followed the guide here
http://svnbook.red-bean.com/en/1.1/ch07s05.html but unfortunately without
the desired result.

The issue I am facing is that new files won't be added despite the statement
that it should be fixed as of 1.5.0:

Use case is:

I have a web application provided by a third party vendor. I take it
customize it and store it in a separate repository. I setup a vendor
repository (not only a different folder in the applications repository)
according to the example in the svnbook but only with the result that new
files are _not_ added (according to the thread on collab.net this should

The setup is the following:
* 1 vendor repository with webapp
* n application repositories with customized webapp
* vendor goes from version 2.0 to 2.1
* application does the following to fully replace specific subdirectories
with the new vendor version (no need to diff e.g. images)
cd local-dev/webapp/vendordir
svn merge --ignore-ancestry http://svn-vendor/vendor/webapp/2.0/vendordir
http://svn-vendor/vendor/webapp/2.1/vendordir --accept theirs-full
* directories which have changes within the custom directories then are to
merged as expected
cd local-dev/webapp/customdir
svn merge --ignore-ancestry http://svn-vendor/vendor/webapp/2.0/customdir

Key items are:
* work across repositories
* Do a full replace (internal delete + add during merge) upon request
(--accept theirs-full)
* Add missing files

In the end, everything is there and it should work but it is not working "as
advertised". For me that would be a compelling "convenience" function to
have an edge over CVS from the usability point of view.

Can anyone confirm that this should work or is it a bug? To me this would be
an awesome functionality to keep (parts of) projects in sync with another.

Thanks in advance for any heads up should I be misusing the feature and I
apologize in advance should my search skills be lacking efficiency.

Received on 2008-09-08 17:57:39 CEST

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.