svn

Large parallel commits

别来无恙 提交于 2019-12-24 12:44:12
问题 This may sound like a very basic question to some of you but I am new to subversion and would like your advice on this question: How should I handle a large commit that took several days of work to code if person B also modified and committed his changes before me? His commit concerned the same files as me. To sum up, here is the workflow: Commit A based on rev.1, not pushed yet Commit B based on rev.0, already pushed, creating rev.2 Is it risky to push commit A given the amount of code that

TFS source code explorer: browse specific revision

这一生的挚爱 提交于 2019-12-24 12:30:14
问题 In SVN it is possible to use the 'repository browser' to browse an older revision of the trunk. That way you can see all folders and files belonging to this and previous revisions in the trunk. When folders and files have been moved this would be convenient to find them, not only a specific changeset. Is there a similar method to do this in the TFS source code explorer? It seems I can only see the latest revision in the browser. 回答1: Update If you want to browse a specific revision without

Delphi: how to lock dfm-s to not change…?

半世苍凉 提交于 2019-12-24 12:16:59
问题 We used Delphi 6 long times ago. Our problem, that Delphi have two problems with DFMs: 1.) When some linked resource (like DataSet) will removed, Delphi many times forget to ask you that "some of the resources are linked, you need to redirect...". This happens, when the actual form is not added to the project, or it is not opened. 2.) When we only open the DFM, and only see some thing, may we change it (active TabSheet, form position). Then Delphi auto save the form - and sometimes it drops

svn errors out strangely

十年热恋 提交于 2019-12-24 12:12:00
问题 unknown command: 'svn-commit.tmp' I have never seen this type of output from svn ci. svn ci is just an alias for svn commit. Anyway, if you know how to fix this, that would be amazing. Until then, I cannot commit any code lol. I looked around on Google for others having this error but I didn't find anything. Running svn cleanup doesn't fix anything 回答1: Could it be that the EDITOR (or SVN_EDITOR , etc.) environment variable is set to svn-commit.tmp ? (This environment variable specifies which

svn backup repository

大兔子大兔子 提交于 2019-12-24 11:44:56
问题 I managed to bring down my subversion remote server (temporarily). However, I have a file backup with subversion root. is it possible to temporarily update working copy from this backup root, while maintaining/(or reverting) original repository location? 回答1: First off, it's best (if you're copying from a live server) to use svnadmin hotcopy instead of a plain fil copy; this ensures that things get read in an order that avoids race conditions if someone commits during the copy. But if you

How to view the entire set of changes made to svn for the last 'n' days?

不问归期 提交于 2019-12-24 11:40:07
问题 How to view the entire set of changes made to svn for the last 'n' days?. I couldn't find a reference in the document though 回答1: You can specify dates for svn log to operate on, so if you want the last n days you only need to calculate the date of n days before today, then feed it to svn like this: svn log -r "{2010-05-23}:HEAD" See also the output of svn log -h for details on the log options. 回答2: In the TortoiseSVN log dialog, you can either filter the already fetched and shown revisions

error when switching to different svn branch

∥☆過路亽.° 提交于 2019-12-24 11:35:56
问题 I've got two SVN branches (eg development and stable) and want to switch from one to another... In every tutorial there is command like: rootOfLocalSvnCopy:>svn switch urlToNewBranch . But it leads in error in my case: svn: REPORT request failed on '/svn/rootOfLocalSvnCopy/!svn/vcc/default'<br/> svn: Cannot replace a directory from within Every help that I found is about svn switch --relocate but I don't want to relocate, just to change my working copy to another branch 回答1: OK, I get it work

SVN: how to merge tags from separate projects

拜拜、爱过 提交于 2019-12-24 11:33:56
问题 I have a single SVN repository with two separate projects: project_1 /trunk /branches /1.0 /tags /1.0.0 project_2 /trunk /branches /1.0 /tags /1.0.0 As you can see, each has identical branch/tag numbers. Imagine there are different files in each project. I want to merge these into a single new project, project_3 . That is, the trunk of the new project will have all files/histories from the trunk of project_1 and project_2 , the 1.0 branch will have all files/histories from the 1.0 branches of

How can I convert a local clone of SVN repo to git

落爺英雄遲暮 提交于 2019-12-24 11:15:27
问题 Although this sounds like a common question, I actually could not find any thread with the same issue I am having on #SO. I have an old copy of an svn repo (checked out from a repo that does no longer exist - server decommissioned a while ago). And I want to checkout commit history on that repo. I figured since there is a ".svn" folder in the root of the repo with 65+M of data in it that it should be possible to do so. What I tried so far (but is not working) : Init a new git repo and try to

How to revert a subversion import?

别说谁变了你拦得住时间么 提交于 2019-12-24 11:14:37
问题 I did a mistake importing in an import to some SubVersion repository, and I want to revert this import. How can I do that? My mistake was this: Given a folder with subfolders a \ a \ a1 a \ b1 a \ c1 I wanted to import the folder a inside a repository folder F, so the structure in the repository be F\a but I imported the folders a1, b1 and c1 and the repository now is F \ a1 F \ b1 F \ c1 I'm using Tortoise Svn, so if your instructions are in terms of that, are better. 回答1: svn mkdir repo