Stack Overflow
Stack Overflow

Questions tagged [vendor-branch]

29 questions
35
votes
4 answers

Vendor Branches in Git

A Git project has within it a second project whose content is being worked on independently. Submodules cannot be used for the smaller, as even the subproject must be included when users attempt to clone or download the 'parent'. Subtree-merging…
SamGoody
  • 13,758
  • 9
  • 81
  • 91
15
votes
2 answers

Vendor Branching, Mercurial Style?

The scene: A purchased web application, with regular updates from the vendor. We then, heavily customize the look and sometimes add our own functionality or fix a bug before the vendor gets to it. For version control, we have been using Subversion…
Nathan Hartley
  • 4,005
  • 2
  • 43
  • 46
11
votes
3 answers

Subversion Vendor Branches

What is a best practice when setting up subversion to use vendor branches? Our repository is structured for individual projects. We are using subversion 1.6.2 and tortoiseSVN 1.6.3. Example folder structure: Project1 /tags /branches …
dnndeveloper
  • 1,631
  • 2
  • 19
  • 36
7
votes
1 answer

Propagate a remote location via clone/push/pull

Our project uses several third-party open-source libraries, some of which require custom modifications. For each library we created our own local git repository, added the original source location as a vendor remote, cloned from there, modified it…
rluba
  • 2,014
  • 2
  • 19
  • 26
6
votes
1 answer

git workflow for making modifications you'll never push back to origin

I'm building an iPhone app with PhoneGap, which has a Git repos. I'd like to keep track of my changes to the PhoneGap code (mainly, adding files to the www directory) in my own Git repository, while being able to pull the latest and greatest out of…
ceejayoz
  • 176,543
  • 40
  • 303
  • 368
5
votes
2 answers

Mercurial "vendor branches" from external repositories?

I want to store a project in Mercurial that contains external code (which can be modified by me) coming from Git and SVN repositories. In SVN I would solve this with vendor branches and copy the code around, but I understood that in Mercurial it's…
Jan Fabry
  • 7,221
  • 2
  • 36
  • 41
5
votes
3 answers

Subversion: Merging a vendor's source code releases into mainline at regular intervals

At regular intervals, I receive a new release of a vendor's software, delivered as source code in a compressed package, and I don't have access to the vendor's source code repository. We make changes to the vendor's source code between their…
RjOllos
  • 2,900
  • 1
  • 19
  • 29
4
votes
3 answers

Subversion: Using only some of the files from a vendor branch

In "Version Control with Subversion", the Vendor Branches section sets up a vendor branch for "libcomplex" and then uses the following command to copy libcomplex into the main development branch: $ svn copy…
user200783
  • 13,722
  • 12
  • 69
  • 135
4
votes
1 answer

SVN Question regarding branching and third party vendor branching

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 (and we get it in a zip file). They have their own release cycle and…
Ferenc Deak
  • 34,348
  • 17
  • 99
  • 167
4
votes
1 answer

How would you use VisualSVN to maintain both local and remote source paths?

How, if it is possible, would you use VisualSVN to retrieve source code from an open source project (such as on codeplex), but also have your own SVN repository locally such that you could keep a revision history for your own customizations, but…
E.J. Brennan
  • 45,870
  • 7
  • 88
  • 116
3
votes
2 answers

Need help / advice on using branches and merging back to trunk

My question is, when merging as per the procedure below, is the last step of the procedure "folding the branch back into trunk" the proper way to do this, in a best-practices scenario? I've been using svn for many years now. In my personal projects,…
Stephane Gosselin
  • 9,030
  • 5
  • 42
  • 65
3
votes
1 answer

How to replace svn's sub directory vendor branch with git's subtree merge

The old process was the normal svn vendor branch, however I only ever copied a sub-directory to the main codebase. So for: vendors/Zend_Framework/current/library/Zend was copied to: trunk/library/Zend I'd then add the new version, tag it and merge…
Dave Marshall
  • 7,367
  • 4
  • 22
  • 15
3
votes
1 answer

SVN: Vendor branches + patching + history?

We have a rather large library that we need to periodically import (and then patch) to our code base. The SVN Book seems to reccomend a "vendor branch" scheme where we keep our patched version of the "vendor drops". This would work, except that…
nonot1
  • 2,788
  • 4
  • 25
  • 41
3
votes
1 answer

Is it possible to have a git repository as a "vendor branch" in subversion?

Is it possible to have a git repository as a "vendor branch" in subversion? In this project we will have several parts, but some parts will use svn and some will use git. So I am looking into a "project root" from where we can have the other…
Johan
  • 20,067
  • 28
  • 92
  • 110
3
votes
1 answer

Is there a way to do a reverse update with Subversion?

I have a branch in an SVN tree which contains the source to a third party product. I need to update that branch with the latest version. If I check it out and copy the new source over the old source, I can easily add the new files and do a commit.…
Ferruccio
  • 98,941
  • 38
  • 226
  • 299
1
2