tortoisesvn

how can I search an svn repository for the existence of files in any revision

由 不想你离开。 提交于 2019-12-03 05:38:42
问题 How can I search if a file named foo.txt was ever committed to my svn repository (in any revision)? 回答1: Right click on the checked out folder's root > TortoiseSVN > Show Log You can enter file names just as well there. 回答2: This should work for you: svn log -r 0:HEAD -v $REPOSITORY_PATH | grep "/foo.txt" This will give you the paths to the files and the state from the log. If you get any hits, you know it existed at some point. If you get no results, there is nothing matching anywhere in the

Handling conflicts in SVN with Tortoise?

由 扶醉桌前 提交于 2019-12-03 05:37:45
Any time an issue comes up like a merge conflict or something similar, it really slows me down. Can someone explain to me how to force-resolve conflicts? For example, a buddy of mine made an edit to a file on the repository and committed. While he was doing that, I had already renamed that file and made many edits to it on my working copy. When I went to commit, I get the conflict error obviously. The file he edited doesn't even exist anymore on my working copy. How can I tell SVN to simply quit crying about the conflict and force it to accept my working copy (ie, overwrite the head revision

TortoiseSVN merging branch to trunk

由 寵の児 提交于 2019-12-03 05:35:54
问题 I know this has been asked several times so I apologize for asking it again, but I just want to be sure I understand the difference between the different merges. I'm the only dev on this project so I'm not worried about over-writing other peoples work. I created a branch of this project because i was about to add some new features and in the event i needed to fix any bugs in the current code, I didn't want to have to deal with working around half finished code. So trunk contains the 'stable'

How to change password using TortoiseSVN?

由 和自甴很熟 提交于 2019-12-03 05:34:02
问题 I need to change my SVN password. I am using TortoiseSVN client. I am not able to find the password change or add user option. Is it possible? Is there any work around or command line syntax to create an SVN user or edit users? 回答1: Password changes are handled by the subversion server administrator. As a user there is no password change option. Check with your server admin. If you are the admin, find your SVN Server installation. If you don't know where it is, it could be listed in Start-

Can I commit only parts of my code using SVN or Mercurial?

由 隐身守侯 提交于 2019-12-03 05:32:12
问题 I use Tortoise SVN usuallly, but I have been looking into Mercurial since it is a distributed revision control system. What I am looking for, in both systems, is a tool that let me pick only parts of a file and commit them. If I want to do this now, I have to copy to a temp version of the file and keep only the changes I want to commit in the current version, and then copy the temp version to the current version again after committing. It's just such a hassle and the program should be able to

How to search SVN repository for a file when I'm not sure where I put it?

由 ☆樱花仙子☆ 提交于 2019-12-03 05:31:12
Co-worker is sure he checked in a file: foo_oustanding.dpr but isn't sure when/where (we have lots of "tools" and "utility" ancillary branches, lots of project branches, etc.. I need a way to search the entire repository for this file. I could check the whole source tree out to my HD, but that would take several hours. Is there a faster way? I tried the Repo Browser (Tortoise) and it didn't seem to have a search. I also thought about dumping the log, from the beginning of time. But that seemed silly. I have, at my disposal: Tortoise SVN 1.6 Subversion 1.5.6 running on Apache It runs on a

Delete a branch

由 拟墨画扇 提交于 2019-12-03 05:28:19
问题 How do I delete a branch in TortoiseSVN? Can I simply delete the working copy of the branch and the folder in the repository? Should the local working copy of the branch first be deleted, or the branch folder through the Repository Browser be removed? 回答1: Right click on any folder, select "Repo-browser" and find your branch on the left panel. From there, you can issue a "Delete" command directly on the repository. As far as I know, you cannot issue a delete command on the top folder* of the

TortoiseHG and TortoiseSVN play well together?

由 孤者浪人 提交于 2019-12-03 05:26:06
I had TSVN installed first and been using for a long time. Then I install T-HG and when I right click I dont see any TortoiseHG. Does anyone have this same problem? All the T-SVN overlays are still there. Starting with version 0.8 (released 2009-07-01) TortoiseHg supports Windows Vista 64bit explorer shell integration. Thanks to the new C++ shell extension (I contributed significantly to that). Check current release TortoiseHg-0.8.1-hg-1.3.1.exe available from http://bitbucket.org/tortoisehg/stable/downloads/ sivabudh EDIT This information is out of date. EDIT: I think this has to do with me

Subversion switch: How can I see which branch is current?

由 烂漫一生 提交于 2019-12-03 05:25:48
问题 We're experimenting with Subversion as a possible replacement of our current Starteam 2005 SCM, (so our SVN knowledge is limited at the moment :-)). I've been experimenting with the switch command (using the TortoiseSVN client) and was surprised that, after I switched my local trunk folder to a certain branch there is no way to see which branch I switched to last. Or at least I can't find a way to ascertain that. Am I doing something wrong here by switching a local trunk folder to a branch?

SVN Reintegrate same branch to trunk multiple times

由 混江龙づ霸主 提交于 2019-12-03 05:12:24
The SVN book states the following: Once you have performed a reintegrate merge you should not continue to use it for development. The reason for this is that if you try to resynchronize your existing branch from trunk later on, merge tracking will see your reintegration as a trunk change that has not yet been merged into the branch, and will try to merge the branch-to-trunk merge back into the branch! The solution to this is simply to create a new branch from trunk to continue the next phase of your development. In my case I want to keep using the branch after the reintegration to trunk and
订阅 tortoisesvn