I have duplicate directory structures in two locations that I need to merge together in an svn repository. By "merge" I mean I want all files and folder that are unique to structure b to be moved into structure a. When I try to do this using svn move I get the error svn: Path 'com' already exists The folders look like: src -> com ...
Hi, Running into a weird problem with svm. I do svn stat in my controlled directory, lists something like: ? myproject/foo ? myproject/zoo so I do: svn add myproject/zoo and then I get this message back: svn: warning: 'myproject/zoo' is already under version control I don't get it, why is it showing it as uncontrolled then?...
I have a project with it depends on another project Core, i use svn:external to maintain the dependency. when i go to create an update of my project, i export those changed files of two tags of my project, but the changed files in Core won't be exported. For example, my project 2.0 depends on Core 1.0, where 3.0 depends on Core 2.0, the...
Hi, Environment is: Windows Server 2008 R2 x64 Slik-Subversion-1.6.11-x64 TortoiseSVN-1.6.8.19260-x64-svn-1.6.11 I have setted up svn srvice based on Jeff Atwood guidlines and can connect work with host via svn command lines like svn list svn://localhost, but TortoiseSVN can't connect to it even on server machine itself. All firewall t...
Hi there, I have a svn repository that I migrated to git using the tool svn2git. Now I would like to push this git layout to a remote repository underneath an existing directory. But, I would like to keep the svn history (tags and branches). For instance: Git remote repository layout: git-repository/dirA git-repository/dirB git-...
I have CVS checkout files. I am trying to migrate into SVN repository keeping the history of CVS.How can I get the information for its migration from the CVS checkout files so that i can keep track of CVS repository? ...
Can anyone tell me how can I make my SVN(TurtoiseSVN) to use the proxy? I'm using windows XP, I've seen bunch of similar questions on this matter and none of them says where(in which location) should I change my configuration. Does anybody know that ? ...
Edit: Thanks msw, omnifarious and tonfa for your answers. Although the example I gave was one of my main uses for propset, omnifarious & tonfa answered the general question as well. The specific question of including tags into text files was solved by this question. Thanks for your help. Original question: " I use subversion keywords ...
I have a Java project I'd like to commit to my SVN repository, created with eclipse. Now, what files (aside from the source code, obviously) are necessary? In the workspace root, there is a .settings folder with many files and subfolders, and inside the project folder there are two files - .classpath and .project, and another .settings ...
I have CCNet setup to talk to our SVN repository, which has it's ACLs setup using Active Directory groups. This is working fine, except I'm not happy with having the user name and password of the AD user stored in plain text on the CCNet instance. Is there a way to either encrypt the AD username/password, or get the CCNet service (I've ...
I used git svn do commit into my svn repository and the comment contained an invalid character. When I try to change the comment as described here I get the following error: svn propedit -r 2958 --revprop svn:log https://svnhost/path/to/repository svn: Valid UTF-8 data (hex: 68 6d 65 6e 66 61 6b 74 6f 72 20 75 6e 64 20 4f 70 74 69 6f 6e...
I use svn to store the revisions of my specification files, written with oowrite (OpenOffice.org). I cannot find the way to compare different revisions of my odt files. It complains their are binary. Is there any tool or plugin to compare odt files stores in svn repository? ...
I have setup svn on my server and Subclipse at home. I am the only developer and am mainly using it for the backup and versioning features. Everytime I commit my changes I get eighter: Out Of date errors or Tree conflicts Sometimes I even delete files and they don't delete on svn, in a directory hierarchy only the very last item ...
I've installed a newer version of svn on my system in ~my/home/bin and put the path to it. So now from command line a newer version of svn is used instead of the old one, located in /usr/bin/. However svnant keeps using an older svn in /usr/bin. How can I tell svnant to use a newer svn? ...
In our project files, if there are binary files, such as .doc, .xls, .jpg, and we choose to not keep their past revisions (just keeping a latest version is ok), is there a way to tell SVN, Git, or Mercurial or some other tool to skip the revisions for these files or for a particular folder? Say, there is a 4MB .doc file that I need to c...
I was just talking to another developer (more senior than I) and trying to convince him that we should implement continuous integration via Cruise Control. He told me that this will not work because he commits code that does not compile to the repository all the time for the purposes of backing it up. And that automated builds notifying ...
I have several separate SVN repositories locally on my machine and I use only the TortoiseSVN client functionality without an SVN server backend. Now I want to merge these repositories while keeping the revision history of individual files. Is that possible with with TortoiseSVN alone or even SVN? Edit: It seems like what I want to acc...
So, after a while of researching what SVN system should I use, I end up creating a project in Google Code.. thing is, that ANYONE can habe access to my repository, and is NOT what I want :) So, I'm looking for a "private Google Code" code hosting web. I found out that Bitbucket and Assembla are good, but.. any opinions? Thx! ...
My boss has a Perforce repository for which he wants to make a read-only copy available on Sourceforge via subversion. He had a perl script which would do this but it's no longer functioning (we don't want to try debugging it yet) and it's really not that great anyway. So an alternate solution is to pull the perforce repo into git as a ...
We are using Subversion for SCC. We have a great deal of our build environment in our repository so that we can check a given version out and rebuild it fairly close to what was in use at that time. We have the following in there now: InnoSetup binaries Third Party Components VCL (including Indy) Our Source (of course) Finalbuilder pr...