tortoisesvn

how to delete the committed test folders/file in google code ?

hi, is there a way to remove the test folders and files that i have committed in the google code branch ? ...

SVN - How to merge a fix on a branch to all afterwards branches and trunk ?

I recently did a hotfix on release 1.0 of my project, it is an essential fix that all afterwards releases/branches like 1.1, 1.2, also the trunk need to be patched with it. What should i do? btw, i am using tortoisesvn as the SVN client. ...

When merging files in Tortoise why do I sometimes get 2 working copies of files.

I recently did a merge in Subversion while most of my conflicts are of the type... MyFile.java MyFile.java.working MyFile.java.merge-left.rXXXXX MyFile.java.merge-right.rYYYYY I can easily resolve conflicts. However a few of my conflicts are of the type... MyFile.java MyFile.java.working MyFile.java.merge-left.rXXXXX MyFile.java.merg...

best way to rename a file

using visual svn and tortoise svn here I renamed my file I notice it say add and delete which to me means history may be erased? What is the best way to rename a file without losing history in subversion? ...

TortoiseSVN Commit htdocs?

Trying to version control my project that's sitting in C:\Program Files\Apache Software Foundation\Apache2.2\htdocs using TortoiseSVN. I can't commit it though because Tortoise doesn't have permission to create the .svn file in that folder (anywhere in Program Files?). How can I get around this? ...

Version control for multiple projects extending a single project

Hi, I'm currently working with a collection of projects which are all their own specific branches / extensions of a generic core project and I am looking for a way to manage the way the projects collaborate. I understand the following is a little vague, I only have a little experience with version control beyond the basic needs of a si...

Updating the trunk from my branch at regular intervals

I am working on a long term branch. I want to update the trunk with the stuff in my branch every week or so. I had been updating my branch from trunk using merge a range of revisions. I then used reintegrate a branch to merge my branch back into trunk. Then I went back to my branch and did merge a range of revisions and I got a ton o...

Search subversion via TortoiseSVN for values inside files?

I'm looking for a way to search subversion to find any file where a certain server name is referenced. Is there fairly straight forward way to create a list or report based on a value in the files? ...

Tortoise SVN "Can't read from connection error"

I have installed SVN server and try to access it using Tortoise SVN client. During the checkout/update process I randomly get an error "Can't read from connection. An existing connection was forcibly closed by the remote host". Some files are loaded (but sometimes not from the first time). I have googled a lot of similar problems, but h...

SVN: Release branch headaches, how to merge in website revisions as and when cleared to go live?

I need a sanity check here if we can, any ideas on correcting/changing the following are very welcome! We've been getting ourselves in knots of late with our SVN and are trying to correct it by putting a Trunk/Release system in place. We have a large website that we develop on and we store it all in SVN. Heres what we had in mind: We ...

SVN Import: "Error: Could not open the requested SVN filesystem"

Hi All! I try to import my old project to new SVN server (svn + web_dav+apache), but however I get some weird error while importing with tortoiseSVN. Adding: C:\tmp\carpirate\test Adding: C:\tmp\carpirate\test\crawlerTestSuite Adding: C:\tmp\carpirate\test\crawlerTestSuite\TestP2p.java Adding: C:\tmp\carpirate\test\crawlerTestSui...

windows explorer icons in tortoise svn take a long time to refresh to correct state

after i commit files, the icons stay on either modified or waiting for commit for a long time. is there any way to force a refresh to ensure that the icon that i am seeing is the correct state of the file. ...

"Naive" svn merge from branch into trunk?

Hi, I am using TortoiseSVN for my C++ project, and am trying to "reintegrate a branch" back into the trunk. My case is simple enough so that for every file which has changed in the branch, I would like it to completely overwrite the matchinf file in the trunk. Unfortunately, TortoiseSVN is smarter than me, so it merges each pair of fil...

TortoiseSVN - "you have to update your working copy first"

When I trying to commit I get this error. What that was done, I think is a rename of the folder. I tried already rename / move the folder. But I continue to get the error. Command: Commit Error: Commit failed (details follow): Error: File 'Page.aspx' is out of date Error: File not found: transaction '99-4a', path '/trunk/src/Solu...

How are you meant to do this so that it works? SVN tree conflicts, etc.

We have a trunk that we've branched. In the branch we moved files using TortoiseSVN into new folders to re-organise the structure. Those files were also worked on in the trunk. So let's call the file /trunk/file1.cs and /branch/folder1/file1.cs We're now trying to merge the trunk changes into the branch and svn is screaming about tree c...

Precommit hook for svn to modify files to be committed in c#

I want to modify in certain way(Actually format the files in a code formatter) before they are committed to repository. I have found out from Precommit example (Use guest as name and no password) how to write in python.But what i want to know is how to get list of files to be committed and other command line arguments this one takes.One ...

Changing svn repository url in externals property

I'm moving my repository to a new location, but I have folders with the (same) repository URL hard-coded in the externals properties. e.g: old URL: https://OldLocation.Domain/svn/ new URL: https://NewLocation.Domain/svn/ How can I change the old repository URL to the new one? simply editing the property doesn't work. ...

How to merge an out-of-sync feature branch into trunk?

Hello, I created a new branch to do some (breaking) work while the other developer kept chugging along working on trunk. Well, now that I got this branch done and ready to merge, I'm having trouble. I am using TortoiseSVN. I did the "merge two separate trees" and what is appears to do is just copy all my changes from the branch into tru...

Can I add a subversion external as an inline folder that I am adding it to?

I have two folders laid out as below: svn/BaseLibrary/trunk (which contains) svn/BaseLibrary/trunk/Core svn/BaseLibrary/trunk/Controls I would like to include BaseLibrary as an external on another project so that the Core and Controls libraries sit inline with the rest of my project. So with my other project below: svn/Project/trunk/...

How do I use TortoiseSVN for this? It doesn't work.

svn co svn+ssh://174.13.24.17/home/svn/dragon-repos/ That's how I check out on my linux box. I would like to checkout on my Windows machine. But, Tortoise SVN asks me for the "URL" (I don't have a URL...I just do it like that, above) Can't I just run the command line to check out, like that? ...