svn

How to detect modified files that were NOT checked in?

I am seeing noob developers forget to check in modified files into a SVN repository. They check in only some files and leave out others!! Clearcase made it easy to see all the modified repository files. What is the equivalent command(s) in SVN which will let a noob developer see all the modified files (so all files can be checked in) ? ...

Working with multiple maven projects and multiple branches

All, currently I have following maven projects all stored in svn: Common-Test v1.0                               -> svn:repo/Common-Test/trunk Common-Core v3.1 (depends on 1)     -> svn:repo/Common-Core/trunk PM-Web v3.1 (depends on 2)               -> svn:repo/PM-Web/trunk Now, I need to create a branch since v3.1 is installed in p...

Should I import and merge completely new rewritten version of project into existing SVN repository?

I've got a website that is stored in an SVN repository. I was asked to completely rewrite it from the ground up which I've done which is not yet under version control. Should I merge my new version into the website's existing repository? As it's a completely new version it has different files and directory structure than the existing s...

check if files have been changed with Subversion svn

I'm using Subversion svn under windows in cmd. How can I check which files have been changed from the revision before? I tried svn.exe info --changelist xx # xx is a revision number But there is no output. I guess I need to add the url to the trunk + I need to tell svn.exe that I want the changelist from the current revision I have...

Removing zombie locks in Subversion

I'm trying to find a way to remove zombie locks using the Subversion command line tools. The eventual goal is to do this from a hook script, but I haven't been able to work out the command line to use when you only have a physical repository path. (Using svnadmin rmlocks only seems to work for locks which exist in the HEAD revision.) ...

Why are all the lines returned by `svn blame Foo.cs` blank?

I have a file in my Subversion repository named "Foo.cs". When I run the command svn blame Foo.cs the output looks something like this: 1000 dave 1000 dave 2000 dave 2000 dave 9999 dave 1000 dave 9999 dave The only thing that I can think of is that from revisions 1000-9000, Foo.cs had the "svn:mime-type" property set to "application...

Resolve Hostname Error When Accessing Subversion

I get the an error when attempting to do the following commands in Subversion: update, commit, log, list, blame etc. However, diff and info work. The error is the following when using any desktop client, e.g. CollabNet, TortoiseSVN, Intellij, Visual Studio's AnkhSVN: "http://xxx01/comm/JavaService/trunk/: Could not resolve hostname `h...

Have you converted from subversion to mercurial? Was it worth the effort?

I am in the process of knowing Mercurial versioning system better, and I am considering convert from SVN. Anyone already converted? Was that difficult for you and your team to switch? Can you give any advice to stay with SVN or go for Mercurial? Thanks ...

How can you temporarily roll back a single file to a known good state in svn?

I'm currently trying to return a single file to the state of a previous revision in subversion. I don't want to commit the file, just leave it as a modification to the working copy for a bit. How would I do that? Edit: It was suggested that I use checkout, but if I run the command that I would expect to work I get: $ svn help checkou...

SVN Log from Dead Server

Hello My organisation ran a SVN repository server for 2 years. This server died in November, we didn't loose any files thanks to the local copies, but we lost the history, which is obviously a shame. I still have my local repository copies and I'd like to know if I can regain the SVN-Log from this local copy. Usually for running svn l...

svn property mergeinfo missing

hi, I have a project with 2 branches let's say v1.1 en v1.2 (in the same svn repository). In v1.1 I modified 2 files and comitted them seperatly (2 revisions). Now I wanted to merge revision 1 into v1.2 and block revision 2 (may not merged). (I use eclipse 64-bit with subclipse a Collabnet for merging.) For the first I choose 'merge a...

What's a good Python Subversion library?

I'm looking for a good python library to manipulate subversion repositories. I'm trying out PySvn, but finding that it can't handle something like pysvn.Client().info("/path/to/svn/repo") because it's not a working copy. Anyone know of any good libraries that can handle this kind of thing? Update - I'll try to simplify it - I want to...

Set up TortoiseMerge as external merge tool for SVN?

Is it possible to set up TortoiseMerge (comes with TortoiseSVN) to be the external merge tool that pops up when you encounter a merge conflict using the "svn merge" commandline? I have tried setting my environment variable "SVN_MERGE" to point to TortoiseMerge.exe, but this doesn't seem to be enough. TortoiseMerge just pops up when I cho...

Basic question: Is a subversion server necessary in this scenario?

Right now: I have a few personal software projects I develop (just me, and on just one PC) extensively use TortoiseSVN for version-control run CollabNet Subversion Server on the same PC Is there really any advantage in having a server instead of just pointing to the repository directory? For example: instead of commiting to svn://lo...

Single or Multiple Git repositories for libraries shared between teams

I am looking at how/if I should make the switch from svn to git. I currently have a multi-layered set of projects in svn which are layered such that D uses C which uses B which uses A. Actual deployed projects like X,Y,Z use any of the common libraries A-D. The aim is for future projects and other teams to share the base libraries (A-...

CollabNet SVN Server or VisualSVN ?

I want to set up a SVN Server on a Windows 2003 system. At the moment I am not sure if I should install CollabNet-SVN or VisualSVN. I have read, that CollabNet-SVN only provides a command line client for administration and that it is a little bit tedious to set it up. VisualSVN comes with a GUI based administration client, which is ea...

SVN fix folder move done wrong

Someone at my work moved a folder to a different location. But he didn't do a proper SVN move, he just added them as new files and deleted the old files. This of course meant the history of items are wrong. I was away at the time and several edits have happened on the files since, so reverting the revisions and redoing the operation myse...

TortoiseSVN: How to merge branch back to trunk without switching working copy to trunk?

We are using TortoiseSVN in a team environment. When working on a bigger feature, I create a feature branch, work for a week there, merge changes from trunk to my branch every other day and when the feature is complete, I merge it back to trunk. When merging, I always do the following: commit everything to the branch switch the whole ...

Is `hg pull --rebase` analogous to `svn update`?

This question assumes there's a "blessed" central repository that members of a team clone from push to when they have contributions that they want other team members to see pull from when they want to see other people's contributions. etc. If so, I would assume hg update is not analogous to svn update (why would there be two commands...

What is the best way to share common logic between identical template-driven websites?

I've built a white label website in PHP that uses templates. Each white label will have it's own set of templates and possibly a few extra folders. All the white label sites are on the same LAMP server. What I would like to do is keep one centralised copy of the main code on the server and then have every site point to these files. Then...