I have merged in Subversion/TortoiseSVN like this a few times: Method A: 1) I change the trunk and commit. 2) I make other changes in a branch and commit. 3) In a working copy from trunk: I merge from the branch using TortoiseSVN's 'Merge a range of revisions'. 4) Then I commit the trunk and delete the branch. However, the Tortoi...
I want to automate this process: A number comes from an external system, let's say 35. Search and find svn commits which have #35 in their comments on branch A. Make list of all the changes of these commits to the commits before them. Apply this changes to branch B. For e.g. if rev 95 has #35 in its comments and introduced a new file...
My site was down today for about an hour while my host was doing some updates to the box I am on. the updates were a PostgreSQL update, Apache Recompilation, and Cpanel update. After the updates were finished up I am getting this error from any SVN commands. svn: error while loading shared libraries: libpq.so.3: cannot open shared obje...
Hi all I recently had to reinstall subversion on my hosting account. The repository I had setup is no longer considered working copy by the new SVN install. How can I added this repository back in to svn? I don't cant do an admincreate and copy it over. I have some checked out copies that need to stay in synch with this repository. How ...
I am trying to get into CI development for a php project, after I failed with phpUnderControl because Java seemed to explode at me I wanted to try xinc. I got xinc installed just fine (mainly because I am good at php and knew what the errors it gave out ment). Is there a step by step tutorial for a project? I have only found this: http:/...
I've been using StarTeam for version control for some time, but am moving to Subversion. I've been reading the Subversion book and there seems to one major feature that StarTeam has that Subversion doesn't - the concept of labels. I know Subversion has labels, but they mean something different in StarTeam. In StarTeam, I can label a s...
I am currently in the process of moving my code hosting from codeplex to google code for various reasons. I have my code in subversion, is there anyway that I can move the code from one site to the other and keep the commit history on the files or would it be best to do a fresh import? ...
With Visual Studio (2008), is it possible to load a project (to a solution) that exists on a remote location ? Basically what I want to do is somehow "host" a VS Project online and then load this project to a solution from a remote location. Is this possible in some way? This is so that I can keep integrity when loading my Utils Libra...
Going by the number of questions on this site for these three distributed version control systems, it seems like Git either is more popular, or is more difficult (hence requiring more questions), or has more features (hence requiring more questions). Or most probably a combination of the three. (Let's say that popularity on this s...
Hi All, I am using svn 1.4.6. While merging from branch to trunk binary files are displayed as being updated in the display but no files are actually modified.The binary files were originaly received from trunk into the branch. Using --ignore-ancestry displays correctly (ie no files are displayed) and no files are actually modified. ...
Last Thursday I built SVN from source on my Mac running Leopard 10.5.7 so that I could get svn+ssh capability. (For some reason that functionality wasn't available using the binary from Collabnet.) The build was successful and I was able to use SVN afterwords, but apache stopped launching. When I tracked down the error, this is what I'...
I want to commit a version of jruby into my svn repository and there are a number of files under the jruby-1.2.0/share/ri/1.8/system/Matrix directory with the special character '%' in the file names. When I try to check these files into svn I get the following error: svn: Commit failed (details follow): svn: '/!svn/wrk/jruby-1.2...
This relates to another question I asked earlier today. I built SVN 1.6.2 from source. In the process, it has completely screwed up my dev environment. After I built SVN, Apache wasn't loading. It was giving me this error: Syntax error on line 117 of /private/etc/apache2/httpd.conf: Cannot load /usr/libexec /apache2/mod_dav_svn.so int...
I'm researching a potential move from SourceSafe to Subversion and we are struggling with the edit/merge/commit vs. checkout/update/checkin paradigm. The primary concern is how do you know which files are checked out with Subversion (and to whom)? Is there a Subversion equivalent to "Status Search" in VSS? Or is it not possible beca...
I was just checking out git-svn and thought I would give it a try with one of my existing repository. When I ran git-svn I got this error. Couldn't open a repository: Unable to open an ra_local session to URL: Unable to open repository '{MyFilePath}': Expected FS format '2'; found format '3' at C:/Program Files/Git/bin/git-svn line 13...
Here at work we are using Subversion and CruiseControl.NET and as our source control and CI tools. Our Subversion structure is setup like the following: Project Branch Tag 1.0.0.0 1.0.0.1 1.0.0.2 Trunk At present our process for creating builds is to create a tag from the trunk and a run batch file ...
Hi, is it a possible to get the files changed from previous build to the next build and who did the changes. ...
Hi, Please let me know the differences between the Subversion and MKS ...
Hi, How to check in only selected files changed in to the repository? ...
We use svn:externals to specific revisions of a library, e.g. like xyzlib -r12345 https://asdf.asdf.local/xyzlib/trunk/ When you make a modification in your working copy to such a checked out external, it is possible to commit even though the external links to a specific revision and not the HEAD. When you run svn update after the c...