Imagine the following situation: I have two branches: DEV and MAIN. I'm working on a file in the DEV branch called program.cs. I checked it in multiple times, so I end up having a couple of changesets: for example 5900, 5905, 5909. Please note these are not contiguous. Now I want to merge these changes to MAIN, but without checking in e...
Hi, Our distributed team (3 internal devs and 3+ external devs) use SVN to manage our codebase for a web site. We have a branch for each minor version (4.1.0, 4.1.1, 4.1.2, etc...). We have a trunk which we merge each version into when we do a release and publish to our site. An example of the problem we are having is thus: A new fea...
In our codebase we are using the following structure, using TFS / - Build - Development - Dev1 - Dev2 - Main - Releases - Rel1 - Rel2 The Development and Releases sections contain branches off main. The Build section sits outside the branching. Within each of the branches there is a section which should not hav...
I have a project which was branched, and a bunch of files (F1) were moved into a different directory and changed (F2). Now, I want to merge the branch back to Trunk and keep revision history, but I want to keep both F1 and F2. Is there a way to do this in subversion? ...
I performed the following actions in TFS: Accidentally made some changes to a bunch of files in the trunk Realized it. merged the changes to the intended branch rolled back the changes in the trunk (using tfpt rollback) later, during the regularly scheduled forward integration from the trunk, I undid the changes in the branch. How c...
The recommended practice of using --reintegrate is generally understood by me. However, the practice of reintegration recommends that the branch be deleted, and if needed for maintenance or warranty development, the branch should be "recreated." However, most examples show the recreation of the reintegrated and deleted branch under a ne...
Firstly I will provide the structure of my branches Trunk Version1 (branch from trunk) CustomerA (branch from Version1) CustomerB (branch from Version2) Version2 (new branch at a later moment in time of trunk) CustomerC (branch from Version2) Now I want to migrate CustomerB to version2 but I need to keep the changes allready ma...
We just upgraded to TFS 2010. We created a development branch for each project. If changes are made in Branch1 and then Branch1 is merged back into the baseline, it merges every file instead of just the changed files. Subsequent changes to files in Branch1 and then merging to the baseline result in only those changes being merged (which...
I am currently working on a project in .NET which consists of several logical layers and multiple front-ends. Here is a rough representation of our SVN structure: trunk ---doc ---lib ---src ------console ---------console.vbproj ------domain ---------domain.vbproj ------... ------web ---------web.vbproj ---.sln All of our day-to-day de...
Using Visual SourceSafe 2005: At an earlier point in time I labelled my source to indicate the release of a new version of the software. What I want to do is now create a branch where the label was created, in order to release a minor upgrade without including other work that I have been doing on the software. Do I use a branch for th...
Does anyone have code (preferably that runs on Win32) that will display a history of all file renames and moves that have occured in a Perforce branch? ...
The documentation on branching in Fossil SCM says a leaf is considered closed if it has a closed tag. However, when I enter > fossil tag add closed xxxxx > fossil leaves --closed > it doesn't show anything as closed. The same thing happens if I add the tag with --propagate. When I check closed leaves of Fossil itself, the leaves lis...
I created a branch of an svn project called 'features', and now whenever I try to update said project, it brings with it a features folder, which contains another copy of the project from the branch. Is there a way to remove the branch from the repository completely so that this doesn't happen anymore? ...
For a very long time we did all of our development and deployment from trunk. After a while this led to a production environment that was out of synch with trunk as we'd get a request to move new feature "B" to production, but hold off on new feature "A" - basically we'd checkout from trunk to a temp folder then selectively merge files f...
Our University provides web hosting to campus departments on servers we manage. Installing open-source third-party programs requires modifying file permissions and code in the program before it will run. (We're using suEXEC, if you're familiar.) We currently offer WordPress via an installer script. The user uploads the newest stable rel...
This happens often in my work flow: I'm working on a feature in a separate branch, and while doing this I'll come across small things that need fixing but are from higher up in the framework or site layout for example. I want to switch back to the main develop branch and commit changes from select files there, then go back to a feature ...
Hi, I've been trying to get my head around SVN merging/reintegrating and have read a these articles/books: http://svnbook.red-bean.com/en/1.5/index.html http://blogs.open.collab.net/svn/2008/07/subversion-merg.html I obviously haven't quite got it, as I can't see why including synched revisions in a merge back to trunk (reflective/cyc...
Hi all, I am using branches in our mercurial repository and have noticed renames done in separate branches are not shown pre-commit after merging to the default branch. However after a commit when you issue the hg diff -g command it shows the rename correctly. The following snippet shows what I mean. A new repository being created. I c...
I have the following situation of branches in a Perforce repository: There’s a mainline “trunk” and two release branches “1.0” and “1.1”. A branch “customer” with customer specific changes has been branched off the 1.0 branch. Now the customer wants to move to version 1.1. How can I merge the 1.1 branch into the customer branch? The cust...
Hi there, I have a subversion repository(running svn 1.6.6) on ubuntu linux server and I'm trying to create a branch using tortoise svn GUI; However, I get the error back COPY c:\work\repositoryWorkingcopy\ to http://svnserver/svn/repository/Oct13, Revision HEAD Error '/svn/repository/!svn/bc/234/branches' path not found I ...