Problem doing SVN Vendor Branch - merge

Posted by Gyan on Stack Overflow See other posts from Stack Overflow or by Gyan
Published on 2010-06-17T15:49:52Z Indexed on 2010/06/17 15:53 UTC
Read the original article Hit count: 249

Filed under:

svn

|

vendor-branch

Hi,

I am trying to use the svn vendor branch to upgrade the third party library. (We have modified the source code)

I followed all the steps to create the vendor branch::

created the vendor branch for old version (3rd party library) created the vendor branch for latest version (3rd party library) copied the latest version to current folder using (usign svn_load_dirs.pl script)

structure of vendor repository in svn

URL/vendor/library/3.5.0 URL/vendor/library/3.7.0 URL/vendor/library/current

I have the library-3.5.0 used/modified at URL/trunk/library/customized-library

I have a problem when I try to merge the difference between URL/vendor/library/3.7.0 and URL/vendor/library/3.5.0 to URL/trunk/library/customized-library

I am at the folder where URL/trunk/library/customized-library is checked out and I use following command to do the merge

svn merge URL/vendor/library/3.5.0 URL/vendor/library/current . --accept PARAMETERS

when I use theirs-conflict for accept parameter, It ignores all of my changes to the old version and copies files from 3.7.0 when I user mine-conflict, it ignores the files in 3.7.0 when I use postpone, it throws exception "tree conflict"

Thanks Gyan

© Stack Overflow or respective owner

Related posts about svn

`svn checkout` on the SVN server causes the repo to break with a 301 error

as seen on Server Fault - Search for 'Server Fault'
We have an nginx server which proxies to a standard set-up of Apache+SVN. The nginx set-up is a very simple proxy: server { server_name svn.ourdomain.tld; location / { proxy_pass http://localhost:8080; } } Apache is set-up as follows: <Location /> DAV svn SVNParentPath… >>> More
Can't create directory named "mysql" in subversion repository

as seen on Server Fault - Search for 'Server Fault'
I have a particular problem with subversion. Environment: subversion (1.6.12dfsg-6), apache2 (2.2.16-6+squeeze7) + mod dav_svn. I can't create a directory named "mysql" or "testmysql" or add and commit a file named "mysql.txt" in my repository. There are many references to "subversion PROPSET 403… >>> More
Using AuthzSVNAccessFile for controlling SVN Access produces HTTP 400 Bad Request

as seen on Server Fault - Search for 'Server Fault'
I have a new repository on an existing subversion server that requires us to perform path based authorization within the repository. I found that the AuthzSVNAccessFile directive in apache is directly responsible for allowing this functionality. After fixing several other problems such as AuthzSVNAccessFile… >>> More
Multi Svn Repositories in Apache

as seen on Server Fault - Search for 'Server Fault'
I have a set up with apache and subversion In the apache configuration i have <Location /svn> DAV svn SVNParentPath c:/svn </Location> Now i have multiple repositories a a_b a_c a_b_c a_b_d b and i want to map them as a/svn a/b/svn a/c/svn a/b/c/svn a/b/d/svn b/svn to do… >>> More
SVN Error 403 Forbidden

as seen on Stack Overflow - Search for 'Stack Overflow'
I can't figure this out. I try to import a new project into a svn repository from Netbeans and get 403 Forbidden. I just setup svn on my serverbox today. I can get to it through a browser just fine, though its empty as I haven't imported my project yet. Apache's path for html files is /var/www I… >>> More

Related posts about vendor-branch

Problem doing SVN Vendor Branch - merge

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi, I am trying to use the svn vendor branch to upgrade the third party library. (We have modified the source code) I followed all the steps to create the vendor branch:: created the vendor branch for old version (3rd party library) created the vendor branch for latest version (3rd party library) copied… >>> More
SVN Question regarding branching and third party vendor branching

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi, We are developing an application which consists of: a source code base given to us by a partner infrequently. This is a somewhat working code, "final" version of something. They have their own release cycle and version tracking. on the code base above we make our changes. These can be either… >>> More
Best way to fork SVN project with Git

as seen on Stack Overflow - Search for 'Stack Overflow'
I have forked an SVN project using Git because I needed to add features that they didn't want. But at the same time, I wanted to be able to continue pulling in features or fixes that they added to the upstream version down into my fork (where they don't conflict). So, I have my Git project with… >>> More