tortoisesvn

问题 My .svn repository is getting quite large (5 GB) and we really don't need to go back quite so far with it. ( 6 months or a year is find). I also have on 8 GB .svn folder at the root of the directory that is checked out of the repository. I would even settle for "starting over" and keeping a copy of the old SVN around for 6 months or a year and then eventually deleting it per How to backup and restore all the source code in svn? 回答1: What do you mean your .svn repository? That .svn folder is

问题 This is a continuation of this question: TortoiseSVN merging branch to trunk If the original question should just be edited, please let me know and I'll do that. Here's the current situation. Have a project with a working copy on my PC that was all up to date. I created a new branch based on that and switched my working copy over to this new branch. Since doing that another developer checked in some changes to the trunk, and I've made some changes to the branch. I don't think we've changed

问题 I have a conflict when merging a .js file - Tortoise SVN says a conflict occured but no edit conflict button is shown. What does this mean, and how do I fix it if there is no edit conflict button? Screenshot of missing edit conflict button: 回答1: If the edit button is disabled, that means that the file in question is not a text file (i.e., has a non-text svn:mime-type property set). In those situations you can not edit the conflict during a merge but you have to resolve the conflict manually

问题 I have a Windows 7 PC with the latest TortoiseSVN version (1.11.0 x64). Almost every time I want to commit changes to the server, I get the following error: Commit failed (details follow): Failed to load properties: sqlite[S5]: database is locked Error unlocking locked dirs (details follow): sqlite[S5]: database is locked Another process is blocking the working copy database, or the underlying filesystem does not support file locking; if the working copy is on a network filesystem, make sure

问题 I'd like to automate TortoiseSVN as part of a commit process. Specifically I'd like to dynamically create a log entry for the commit dialog. I know that I can launch the commit dialog either from the commandline or by right clicking on a folder and selecting svncommit. I'd like to use the start commit hook to setup a log entry. I thought this worked by passing an entry file name in the MESSAGEFILE variable but when I add a hook script it cannot see this variable (hook launched successfully

问题 I need to intergrate a branch into the trunk but the folder hierarchy of my trunk changed in the meantime. I should still be able to merge sub-folders which preserve the original structure, but when I try I get an error. Example: Original structure when branch was created: svn/trunk/dir1/dir2 --> svn/branches/b1/dir1/dir2 renamed: svn/trunk/dir1 --> svn/trunk/dir3 made changes to files in svn/branches/b1/dir1/dir2 Now I want to reintegrate svn/branches/b1/dir1/dir2 --> svn/trunk/dir3/dir2 回答1

问题 I'm looking at the log messages for a particular branch in TortoiseSVN. We have an automated build process which has commits regularly to the branch using the author "builder". In the TortoiseSVN search box, you can filter by authors and you can use regular expressions... what search expression can I use to show all the log messages not committed by author "builder"? Is it possible? 回答1: add !(builder) to the filter box kindness, dan 回答2: As agileguy already mentioned, the string "!(builder)"

问题 I have checked out the trunk and have done a merge from branch to trunk. Now all the changes made in branch are present in my trunk working copy. If I do a commit on this working copy, is there any way to identify later that it was a merge and not like a normal checkout-modify-checkin. I can specify the merge details in the log, but I am interested if SVN has some methods to identify and track this. I have seen in other version control tools like clearcase, a merge arrow will come in the

问题 I'm new to SVN but have used Clearcase for years. My issue is I have some changes on a branch which I have merged back to trunk using TortoiseSVN "Reintegrate a branch" feature. Now when I look at the version tree I don't see any edge being rendered from the tip of the branch to the tip of the trunk, which I would expect to see. In Clearcase you would see merge arrows indicating the direction of the merge between branches of a file/folder. Is this simply a rendering issue on TortoiseSVN or is

问题 i am merging branch to trunk using tortoise svn option Merging Two Different Trees I have file i.e file1 under trunk but not on branch I have checked out trunk to my local .then did Right- click > Merge > Merging Two Different Trees > mentioned from as trunk url and to as branch url > Test merge Now file1 is shown as deleted under Test merge results but why ? Ideally it should ask me that this file does not exist under branch but exist on trunk. Do you want to keep it or not ? Is there an