Is there a way to do something similar to a SourceSafe label in svn? I know of the bransch/tag, but I would like to have a more lightweight way of just setting a name for a specific revision.
I have recently run into a particularly sticky issue regarding committing the result of a merge in subversion. Our Subversion server is @ 1.5.0 and my TortoiseSVN client is now @ 1.6.1.
I am trying to merge a feature branch back into my trunk. The merge appears to work okay; however, the commit fails with the following error message.
Commit failed (details follow):
File
'flex/src/com/penbay/invision/portal/services/http/soap/ReportServices/GetAllBldgsParamsByRegionBySiteResultEvent.as'
is out of date
'/svn/ibis/!svn/wrk/531d459d-80fa-ea46-bfb4-940d79ee6d2e/visualization/trunk/source/flex/src/com/penbay/invision/portal/services/http/soap/ReportServices/GetAllBldgsParamsByRegionBySiteResultEvent.as'
path not found
You have to update your working copy first.
My working trunk is up to date. I have even checked out a new one into a different folder to make sure there wasn't any local cruft messing with the merge. I have done some more research into this and I think part of the problem is user error. I think our problems are:
We had some developers committing work with a subversion client before 1.5 and some after. I believe this has the potential to corrupt the merge info.
In other branches we have performed partial merges. That is, we did not always perform merges at the root of the branch. This was to facilitate updating Flex and .NET efforts within the same branch.
We performed cyclic (reflexive) merges on our branch. This was done because we had multiple parallel branches and we wanted to periodically update our branch with the latest code in trunk.
All of these things are explicitly not recommended by the Subversion book/team. We have learned our lesson and now know the best practices. However, we first need to merge and commit our latest branch.
What it the best way to correct the problems we are encountering?
Would deleting all the merge info in the trunk and branch be a viable solution?
No. I have done this but it does not resolve the error that I am getting above.
Hi,
I have successfully setup Subversion repositories using SVNParentPath. But I would like to control the view of repositories list based on user access permission. Example User A only can access repository A and repository B. So when he browse to SVN url he only can see repository A and repository B. Others repositories are invisible for him.
is that anyway to work it out?
I am using TortoiseSVN and I have a SVN repository organized in this way:
folder1
folder2
trunk
tag
branches
folder3
trunk
tag
branches
folder4
folder5
trunk
tag
branches
I would like to know if there is a way to checkout only trunk directories, keeping the entire tree under the versioning control:
folder1
folder2
trunk
folder3
trunk
folder4
folder5
trunk
In this way I can update all trunks with a single update command on folder1, without updating tags and branches which can be full of data.
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!
I want to learn how to write shell scripts.
Particularly I want to write a svn post-commit script to upload files from a test server to a production server. I am sure I will want to write more as I get more into it.
I have very little linux/unix knowledge. Can anyone recommend a good book?
I'm pretty used to how to do CVS merges in Eclipse, and I'm otherwise happy with the way that both Subclipse and Subversive work with the SVN repository, but I'm not quite sure how to do merges properly.
When I do a merge, it seems to want to stick the merged files in a seperate directory in my project rather than overwriting the old files that are to be replaced in the merge, as I am used to in CVS.
The question is not particular to either Subclipse or Subversive.
Thanks for the help!
Has anyone had any success importing TFS 2008 history into a new Mercurial repository?
The only possible solution I've found to date is to go TFS - svn - hg using tfs2svn and then using the Convert Extension but I haven't tried this yet.
Hi,
I am getting this error while while giving this command:
cvs2svn --trunkonly --svnrepo /path/to/new/svn /path/to/existed/cvs/repo
The error i am getting is
Error summary:
ERROR: No RCS files found
Are you absolutely certain you are pointing cvs2svn
at a CVS repository?
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?
The only source control I ever used was SourceGear Vault on my local machine. I need to put a new project on a svn server I got at beanstalkapp. I installed tortoiseSVN and AnkhSVN. I successfully connected everything, I see 3 folders:
branches
tags
trunks
I created my project and I want to attach it to the server, which of these folders do I select? What is the use of the these folders?
Is there a way in TortoiseSVN - without the regular svn client binaries being installed on the system - to detect an orphaned checkout's revision number?
"Orphaned" meaning that the source it was checked out from no longer exists.
I'd like to learn other people workflow when using either SVN or GIT.
Please describe your strategy to handle the following tasks:
Implement a feature
Fixing bugs (during development and deployed app)
Code Review
Refactoring code (post code-review)
Incorporate patches
Releasing the newer version of your app (desktop, web, mobile, would you treat them differently?)
Feel free to organize your answer not grouped by the tasks but grouped by whatever you think is relevant but please organize it by VCS/DVCS (please don't mix them).
Thank you.
duplicate: How do I sync the SVN revision number with my ASP.NET web site?
How can you automatically import the latest build/revision number in subversion?
The goal would be to have that number visible on your webpage footer like SO does.
I'd like to have a version control server (preferably SVN) accessible on the internet without having to host my own (linux) server. Setting up a home server ala DynDNS is not really an option.
Can you have non-public (maybe single-user) projects on one of the OSS project hosting sites? Or are there alternatives?
I had a look at Google Code. But that looked very public to me.
Any help would be greatly appreciated :-)
I was trying to get fresh copy of my project from github using tortoise svn client. But I am getting following exception.
The PROPFIND request returned invalid XML in the response: XML parse
error at line 1: no element found
(Checkout from https://github.com/anoopchaurasia/JavaScript-File-Manager.git)
When I tried to checkout using subeclipse on Eclipse, it saying "Folder does not exist.".
I am able to checkout same repository on my other system.
Hi all,
I am trying to get a latest version of a particular file from the repo. SVN UPDATE doesnt overwrite my local working copy.
Actually I have the latest version from the Repository (eg revision 98). After Checkout I made some changes to the file and now I want to get rid of those local changes and get the copy from the repository (which is still at revision 98). How can i do this on Linux machine???
I want to learn how to write shell scripts.
Particularly I want to write a svn post-commit script to upload files from a test server to a production server. I am sure I will want to write more as I get more into it.
I have very little linux/unix knowledge. Can anyone recommend a good book?
Why do build servers poll for changes instead of SVN firing off an event (or a post-commit step) that tells the build server to start a build? It seems terribly inefficient to poll for changes, especially when the number of projects increases and the polling period is set to a very low value (for example, 30 seconds).
Hi,
I'm in a team that all members have VS2008 installed on their machine, we have tortois svn as source control system.
Is there a solution that I can work with them with VS2010 installed on my machine? Or I have to install VS2008 to work with the other members?
thanks.
I have a project which is source controlled using Subversion and VisualSVN. Since the version of web.config is different on the server and the developers' computers I want the file to remain on the computers but to be ignored by Subversion. I added it to the svn:ignore but it still remains (and still has a red exclamation mark too since we are not committing it).
How can I remove it from Subversion safely without it being deleted from the files system
Thanks,
Adin
It sometimes happens to me that I forget to include a file in a changeset (i.e. a commit of a number of changed files that belong together, e.g. "Fixes bug #45")
I will usually just make a second commit with the same commit message.
Is there a clever and simple way to add the "latecomer" to the first commit somehow? Without svn dumping and svndumpfilter ing?
I have a task:
"Find base revision: select latest SVN revision that has message "TRANSLATION_BASE_EN_NO". If tag was found - get all the resources from that revision"
How can I read messages, and search for the revision I need?
I want to see a piece of code of course. In C# (vs2008)
Thanks
I have a Rails application working on Passenger deployed using Capistrano from a subversion repository. The subversion repository is lost. We just have a folder named "cached-copy" which I believe has been made by svn. Is it possible to recreate a subversion repository from this "cached-copy"?