This is the first time trying to merge the latest in the trunk Head to my branch. I just want to get any latest updates from other developers on my team into my branch. I am using Subversion 1.6.7. So in the Merge dialog I selected the option "Merge 2 different trees". My question is this: My branch's latest revision is 358 and the ...
I don't know if this hook is out-of-box or if mine is just messed up and I just need to replace it but when I go and try to edit a log comment on a commit I get this error message: DAV request failed; it’s possibly that the repository’s pre-revprop-change hook either failed or is non-existent At least one property change failed; reposit...
I can't figure out how to use the command line for SVN when SVN is installed by Tortoise. I'm trying to invoke some commands found here: http://jacqueschirag.wordpress.com/2007/07/22/changing-revision-property-in-subversion-with-tortoisesvn/ but I'm not seeing the same directory structure under Program Files (x86)\VisualSVN Server (ob...
Related question: Moving repository trunk to another’s branch (with history) I know that one can dump a complete SVN repository with history and load it into a user-defined (sub)directory of the target repository using: // in source repo > svnadmin dump . > mydumpfilename // in destination repo (backslashes because I'm using Windows...
Lately I've been seeing behavior where after an update svn shows certain files as "conflicted" but when I try to edit the conflicts, there are none (The "next conflict" and "previous conflict" buttons are disabled and if I scroll through the file, none of the lines are marked red). This seems to have started after I started working from...
I recently found a cool little project that I would like to download the source code of. Using the web interface on Google Code, I can browse through all of the files in the source code of the project. Google gives me this: # Non-members may check out a read-only working copy anonymously over HTTP. svn checkout http://xnamugen.googleco...
hi, Check out the following scenario: /trunk at version: 200 /branches/mybranch at version: 200 /branches/mybranch Last commit version: 192 Now i want the latest code (exact copy) of /trunk to /branches/mybranch. What is the best option to get the exact copy?? I tried Merge from revision 192-200, but i always missied some files from /t...
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...
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...
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...
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 ...
I'm using SVN externals to include a couple of directories from another repository but I also need to set up externals for two individual files in the root of the project directory. According to the documentation this is not yet possible: The URL for a file external must be in the same repository as the URL that the file external ...
I have a SVN branch that I branched off from the Trunk several revisions ago. I have merged the branch with changes from the trunk to keep it in sync. Now I would like to finally integrate my Branch with the Trunk. What is the best way to go about this? I cannot use the re-integrate option because our SVN server version is only 1.4. ...
Why does doing a "Revision Graph" take so much longer than doing a "Show Log"? The Revision Graph starts at the head and counts down to Revision 1. I'm up to over 1000 revisions and it takes about 1 minute to count down. The Show Log is almost instant and only shows the revisions that this project has. There are only about 10 revisio...
Hi, when doing a merge, is there any subversion property that I can set to always replace the file with the newer ervision (instead of doing a diff and raise a conflict when it can't merge)? The set of files I am referring to is the c# project files (*.csproj). These files always raise a conflict. I would like to have these files alway...
How can I configure TortoiseSVN to connect to a SVN server behind a corporate firewall from home? This is the question I'm having a hard time finding an answer to. Here's what I DON'T have: Official VPN access to the corporate intranet. Control over the SVN server. Any control over the intranet. Cooperation from the IT department. H...
We're in the middle of changing from VSS to Subversion and we have a website project on our Subversion Repo. We've removed the Bin folder as it causes all kinds of chaotic tree conflicts since our development solution contains some Class Library projects the Website project depends on (set up as project references in our solution). We al...
Although a subversion repository is like a time machine where nothing is ever deleted. i still find myself reluctant to totally 'svn delete' things from my codebase if i think i might want to search for it at a later date. So, i will feel freer if i could have some way of keeping a local-copy index of the keywords and phrases in the rep...
I created a branch and then made changes to trunk which need merging into the branch. TortoiseSVN has a nice handy merge branch->trunk utility, but to do it this way round do I have to manually merge specific revision ranges? ...
I'm not sure if I need to use the Switch command in Tortoise or what but in my branch, I've got a couple folders that are still pointing to the mainline trunk and need to be pointing and included in the branch instead. I noticed this wheh checking in changes to my branch and those folders were not included...because they were not pointe...