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. However, I would also like make sure that any files that are the old version but not the ne...
Git newbie here. 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 PhoneGap. What's the best way of doing this? Is this what a branch is i...
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 cannot be used, as the subproject is being actively developed, and subtree merging makes it...
In svn red book in vendor branch chapter, it is proposed to maintain a current/ containing the latest release of 3rd party product, so from the example we end up with: repos/vendor/libcomplex/current - contains 1.1 repos/vendor/libcomplex/1.0 repos/vendor/libcomplex/1.1 What is it purpose of current/? Why we need initially pu...
I have used svn_load_dirs.pl to create vendor branches and I have the following versions in my vendor branch 1.2.0.1/ 1.2.1.2/ 1.3.0/ 1.3.1/ 1.3.1.1/ 1.3.2/ 1.3.2.1/ 1.3.2.2/ 1.3.2.3/ 1.3.2.4/ current/ If my working copy is at version 1.3.2, can I go from that version all the way to 1.3.2.4 with one svn merge command? Or do I have to...
I don't understand svn merge. Here's the scenario: We have a branch that contains the latest stable copy of our code. I will refer to this branch as 'the branch'. There's also a trunk branch which contains a few new additions, but we don't want to mess with that at this point. We have a vendor branch which contains an updated version o...
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 releases. Our changes do not get incorporated into their releases, but I need to merge changes ...
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 still once and a while check the codeplex project for changes that I might want to apply to m...
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 (and we get it in a zip file). They have their own release cycle and version tracking. on the code base above we make our changes. These can be either bugfixes...
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 f...
Hi 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 projects as vendor branches (or similar). And the question is if it is possible manage thi...
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 following their “Vendor Branch” model each time we received a new release. This has the ad...