Hi, I used Visual SVN Manager to create a repository, but I didn't create /trunk /branches and /tags at first. Now, I NEED to add these since the project has grown up ==> branching and merging is essential! What is the best way to do so ? ...
Hi All, I have a huge project. I need to make a branch - this will be version 2 of the project, but I also need to keep the trunk and change it in parallel with the branch 1 as bug fix to the version 1. I need to merge bug fixes from the trunk to the branch 1 while adding new features to the branch. At the end I need to merge all cha...
I'm trying to reintegrate a development branch into the trunk in my Subversion 1.5 repository. I merged all the changes from the trunk to the development branch prior to this operation. Now when I try to reintegrate the changes from the branch I get the following error message: Command: Reintegrate merge https://dev/svn/branches/devel i...
I use TortoiseSVN and frequently switch between a branch and the trunk, using the switch command. I noticed that if I don't commit before the switch, local modified copy gets merged. Is there a way to customize the tool to, say, warn me to commit local changes before switch? ...
I've got a big-ish project that needs a lot of work on a new feature, so I planned on using a branch to do this work. I haven't had to do this before, and I just wanted to get assurance from an experienced Subversion user that things "should" work smoothly. What I'm especially concerned with is how well Subversion handles deleted, renam...
I'm in a stupid situation: I have done some changes in a working copy of the TRUNK. Since the changes have not been tested, I'd like to transfer all the changes to a branch. According to the manual of Tortoise, Switch will lose all my modifications. Is there any way to keep my changes in the working copy and save them in a branch in the ...
Hi All, Got a (hopefully small) question regarding SVN and checking out repos. Basically I see conflicting tutorials and suggestions regarding what to check out and when. Some will say: svn co http://my.repos.com/project my_project …while others say: svn co http://my.repos.com/project/trunk my_project When would I want to grab...
Due to a change in developers, I need to destroy my trunk (but keep for posterity) and then load in a local copy to replace it. I have a couple of thought on how to do this. 1) Delete every file from trunk 2) Commit the deletions 3) Copy the "new" trunk into the working copy 4) Add recursively all files 5) Commit OR 1) Move trunk to ...
We are moving to Mercurial from Subversion. With Subversion, we have http://trunk.myproduct.com for testing purposes. I am wondering what the standard name for a trunk-like site is for Mercurial. 'trunk' seems like a Subversion term. http://default.myproduct.com is the most obvious name, but is that what people generally use? I am lookin...
Hi folks, I've made a fork of some codeplex project. Done some extra code, etc and have even pulled my custom code into the source control repo. In those few weeks and months since i was working on my own fork, their main trunk has been updated. how can i sync my code with that of the trunk? (the main reason for me wanting to sync my...
I dont know where to save the script or how to link it in this field. I found this script on a different website, and I feel that it would work fine for what I need it to do, just alert me via email when the truck is down. #!/bin/bash echo "You're screwed, the trunk you bought is down"|mail -s "You have a problem" [email protected] ...
Hi, I was wondering if it's possible to run two projects at the same time in Eclipse, for example by using two different instances of JVM (if that makes any sense). A bit of the background: I have a project that executes relatively long experiments (6-8h). I have recently managed to come to a point in development where I could branch ...
Hi everybody. It's a month I'm trying to figure out the best solution to my problem and this is the best one. I would like to know if you agree with it. We are developing a set of interconnected web applications. We treat each application as a single solution indipendent from the others. Each application is formed by different projects,...