tortoisesvn

What is the correct way to handle repeated merges of an SVN branch?

Here we have have an SVN repository with a trunk and a branch for development on a new release. The branch is nearing ready for release now so I decided to reintegrate the branch back down to the trunk. Obviously there were some conflicts. Including quite a lot of tree conflicts from files that had been deleted in the trunk. I resolved...

Mysterious non-change showing up in TortoiseSVN / TortoiseMerge

I use TortoiseSVN for version control. In a working cooy I have been working with for weeks, I suddenly see a number of "changed" files showing up in the "SVN commit.." dialog that I have definitely not touched and which do not contain any real differences: I have not changed these files' encodings not performed any other operation on...

AssemblyInfo.cs subversion and TortoiseSVN

I'm using TortoiseSVN and Visual Studio 2008. Is there any way to update my project's assemblyinfo.cs with svn's version in every build? For example, 1.0.0.[svn's version] -> 1.0.0.12 ...

What happens when I click "Blame Differences" in TortoiseSVN log?

Hi, when I was checking the latest difference in code in SVN Log, accidently I clicked blame differences insted of show differences. Now, when I check the log again I do not see anything visible related to my blaming. Do you know what exactly happens when you blame a difference? Does it effect the repository and if yes, how can I undo ...

Installing TortoiseSVN and TortoiseGit together

I have TortoiseSVN installed and it works great. Would like to have an equally great interface to things hosted on Git. Is TortoiseGit as good as TortoiseSVN? Can they both be installed without much trouble? Will menus be duplicated? Will stuff be weird? Any experiences with this? I'm running Windows 7 64-bit, if that makes any diffe...

Using TortoiseSVN via command line

Hello I want to use commandline svn options. I use TortoiseSVN and I run several commands and I get the following error: 'svn' is not recognized as an internal or external command I used the command svn checkout [-N] [--ignore-externals] [-r rev] URL PATH I think I should add some environment variable or something else. Any id...

Automating Subversion with C#

I'm designing a document library, and I'd like to use Subversion as the version control system. How can I automate tasks like check-in, check-out and diff from C#? Does Tortoise perhaps offer some help with this? TIA. ...

How to know who checked out the repository in SVN

Is it possible to know which users checked out a repository of an SVN Server? Thanks ...

[SVN]: Subversion vs. GIT vs. other open source SVNs.

Being a .NET developer, I used Visual SourceSafe that comes bundled with Visual Studio. From quite some time I am working on technologies other than .NET, and started using TortoiseSVN. I am a beginner in this area of open source SVNs. I have few queries regarding this: (1) Which one is better, Subversion or GIT? I want to use on Window...

How to tell if someone has downloaded the latest code

Is there a way I can tell (other than in the SVN Log...because it only shows me if someone committed) who has updated recently so that I know they have downloaded my code? I'm looking specifically into updates (not commits which can obviously be seen in SVN Log). ...

Code Review Tool Integrated with Gemini

Has anyone come across a code review tool that integrates with Countersoft's Gemini? I don't need anything too sophisticated. We have a relatively small development team of 10. I'm not looking for yet another web app to log into, I'd like to assign code reviews tasks using Gemini (similar to the FogBugz/Kiln). We are currently using SVN...

page is not served because it has been explicitly forbidden - extension .asp may be incorrect

I'm trying to run a test version of a web using the File System (i.e. the "Cassini" web server built-in to Visual Studio 2005) rather than HTTP://localhost (IIS 5.1 on my Win XP dev PC). This web is a hodge-podge of classic ASP files written years ago and some new development in ASP.NET (VB.NET). How can I get past this error message a...

Ignore Files in Subversion on Per-Project Basis

I recently began working on a large project that contains a huge number of files. For some reason (which I don't understand), the team decided not to use svn:ignore and, as such, each developer needs to provide his or her own set of ignore parameters. I'm using the TortoiseSVN client, and there is a way to do this (using the global ign...

TortoiseSVN never runs post-commit.bat

Hi! I have set up my subversion/trac environment on Windows (Now Win7, previously tried on Vista) and all works perfectly. But I can't get my post-commit to work. Here's the setup (using VisualSVN and Trac running on Apache): C:\Users\Martin\Repositories\test_svn\hooks: post-commit.bat: call %~dp0\trac-post-commit-hook.cmd %1 %2 tr...

Subversion: How to append text to every committed file?

I am looking for a way to do the following either on pre-commit or post-commit or any other way. Here is what I need to be working User commits the file Something runs (hook or something else) That something else from #2 should append static text to the file being committed Based on this http://subversion.open.collab.net/ds/vi...

[SVN]: Using two Subversion clients.

I have a working folder. I use Commit by right-clicking on it after my work is over and TortoiseSVN commits to a repository in my local computer. I am using Aptana for my development and recently added Subversive plugin. I want to link the same working folder with Subversive. For this I created a new repository in a different folder. Lat...

How do I find the revision that changed a line in my code using TortoiseSvn?

I have one line of code which seems commented. Basically the thing I want to find is the revision that changed this line in the code. So, is it possible to see changes in code related to a specific keyword in TortoiseSvn Log? ...

Subversion Ignore Pattern not working too well

I've got the following pattern for my global ignore pattern: *.pdb *.suo *.user *.cache */_ReSharper */bin */obj *.o *.lo *.la *.al .libs *.so .so.[0-9] *.a *.pyc *.pyo *.rej ~ ## .#* .*.swp .DS_Store resharper folders for example (_ReSharper.SubtextSolution) are still being committed as well as some other folders such as bin for some ...

SVN: Moving repository trunk to another's branch (with history)

I'm working with an SVN setup with a lot of repositories. I'm trying to consolidate some by moving the trunk of one into the branch of another (the old ones are themed versions of the new one, minus some code fixes I'll be applying later, so it makes sense to me). Short version, I want to go from RepositoryA/trunk to RepositoryB/branches...

Revert From Revision

I am using Tortoise SVN. I had checked in a crapload of code recently (one commit). In a 3 hour meeting they decided to scrap a bunch of my code and that feature. My boss wants me to put Subversion back in place with the old code for that area of the application. I'd say there were about 3-4 files affected. Meaing in that last commi...