vendor-branch | 易学教程

svn vendor branch

阅读更多关于 svn vendor branch

问题 In the svn red book, in the chapter "Vendor Branch", 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 put a new version to current/ and only after that to copy current/ in a version dedicated directory (e.g. 1.1)? My guess it's for: To make different versions svn

Propagate a remote location via clone/push/pull

阅读更多关于 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 as needed and pushed it to an internal remote repository (let's call it origin ). These repositories are then used as submodules in our core project. The problem: The "vendor" remote url is not propagated to the "origin" and is therefore lost to

Are there any alternatives to svn_load_dirs.pl?

阅读更多关于 Are there any alternatives to svn_load_dirs.pl?

问题 We have a large vendor branch (1200 odd files) that has recently undergone some non-trivial changes, which I'd like to integrate back into the trunk. It updates fairly frequently and we'll need to update equally frequently, so doing it by hand is going to involve far too much wasted time. This is what svn_load_dirs.pl was made for, only I've no perl interpreter and going through the the layers of bureaucracy to get one installed would, based on past experience, take longer and involve more

Vendor Branches in Git

阅读更多关于 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 cannot be used, as the subproject is being actively developed, and subtree merging makes it very difficult to merge those updates back into the original project. I have been informed that the solution is known in the SVN world as "Vendor Branches",

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?

问题 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 this "project root" with subversion? Thanks Johan The inverse question can be found here: Is it possible to have a subversion repository as a “submodule” in git? Update

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

阅读更多关于 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 releases. Our changes do not get incorporated into their releases, but I need to merge changes from their releases into my mainline. My repository layout looks like this: /branches/Vendor X release 1.0 /branches/Vendor X release 1.1 /trunk/ The workflow I

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

阅读更多关于 git workflow for making modifications you'll never push back to origin

问题 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 intended for? Also, how would I get it to ignore the fact that I deleted folders I don't need, like the android/ and blackberry/ folder? 回答1: This is exactly

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

阅读更多关于 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 releases. Our changes do not get incorporated into their releases, but I need to merge changes from their releases into my mainline. My repository layout looks like this: /branches/Vendor X release 1.0 /branches/Vendor X release 1.1 /trunk/ The workflow I followed was: I added Vendor X release 1.0 as a branch and then copied it to the trunk. We made some

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

阅读更多关于 git workflow for making modifications you'll never push back to origin

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 intended for? Also, how would I get it to ignore the fact that I deleted folders I don't need, like the android/ and blackberry/ folder? This is exactly what a branch is for. You should work on your branch, and pull changes from the main branch, possibly using -

Propagate a remote location via clone/push/pull

阅读更多关于 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 as needed and pushed it to an internal remote repository (let's call it origin ). These repositories are then used as submodules in our core project. The problem: The "vendor" remote url is not propagated to the "origin" and is therefore lost to anyone who clones the internal library repository. Every time you want to merge the new upstream changes