version-control

问题 I'd like to checkout an older tagged state in the current darcs repo (its working dir). I don't want to clone to another directory (because I have setup a cabal sandbox in the current directory). I have already pushed all new changes to a remote repo, so I don't really care whether the changes are completely lost locally. (But still: can't I keep the patches saved, but still checkout an older state?) How to do this? Attempts I tried darcs obliterate --from-tag=TAG but that gave not exactly

问题 I have a subversion repository, and I would like to create a branch, but the repository does not have the canonical directory structure of /trunk , /branches and /tags - it just has everything that should be in /trunk , in the root folder. Am I screwed, or is there some way to correct the directory structure (or to create a branch within the existing directory structure)? 回答1: Try something along the lines of $ svn mkdir $REPO/{trunk,tags,branches} $ for f in $(svn ls $REPO |grep -v 'trunk/$\

问题 This question follows this topic. I am trying to understand what merge do to avoid unwanted mistakes during it. I have two branches: master , b . I saw an strange result of doing git merge . You can see output of git log before merging , here: * 148c970 (HEAD, master) rename 1 in master to 1_master | * ad18d9b (b) rename 1 in b to 1_b |/ * 15cd89b add 1 in master So I had a file with name 1 in master and b . Then rename it in master to 1_master and to 1_b in b . Then I did git merge : git

问题 I am porting a project that was originally only worked on by me to bitbucket so that someone else may help me. We do not want this to be an open source project and it should only be the two of us working on it. The question is whether I make it a personal repo and then invite him to it or whether I make a team that the two of us are on and then have a repo for the team. Is there a difference between the two approaches? Any benefits to either one? 回答1: No, don't have any difference between the

问题 I have this problem that has been bugging me for quite some time now. It is perhaps best explained by referring to the following (well-known) script: @rem= 'PERL for Windows NT -- ccperl must be in search path @echo off ccperl %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 goto endofperl @rem '; ########################################### # Begin of Perl section $start_dir = $ARGV[0]; # # Fixed variable # $S = "\\"; $list_file = "c:".$S."list_file"; $list_add = "c:".$S."list_add"; $choosed = "c:".$S."choosed"

问题 I am using git for the first time, and based on advice from others, I have started using it from the command line rather than from within xcode. After initially committing my project folder, I saw that several files were automatically excluded, including the .xcodeproj file. I added that file and received this error: E325: ATTENTION Found a swap file by the name ".git/.COMMIT_EDITMSG.swp" ... process ID: 8453 (still running) While opening file ".git/COMMIT_EDITMSG" dated: Thu Dec 8 08:21:00

问题 I want to create a new repository but don't want to include folders with cachefiles etc. I tried everything but it keeps committing all files and folders. In my project overview the folders are marked as 'ignored' for SVN and when doing a initial import I uncheck the box for committing ignored files/folders. 回答1: Judging from the fact that on the PHPStorm web site version control helps I can find no mention of " the box for committing ignored files/folders " It sounds like you are: Setting a

问题 I have seen where changes have been made on one code file by two developers code like this: x++ End up like this: x++ x++ where due to carriage returns being inserted/removed (I think) one line has become silently merged as two lines of the same code (no conflicts) Everything compiles but suddenly tests are failing and weird behaviour ensues. Should this be possible? How do I guard against it? 回答1: This shouldn't be a problem, unless the developer doing the merge marks the conflict as

问题 I am looking to add an existing file tree to a git repository as a new branch (I can't just copy the existing tree into my git tree, since the existing tree is versioned under a different VCS, and I am trying to sync them up). Is this possible? EDIT : Would setting up a new git repository, that is connected to the existing remote repository, and then moving the resulting .git folder work? That seems really hackish, but if that's the way to do it... 回答1: You can try to use --work-tree=<path>

问题 so I am on a branch "somebranch," and I go back to master by git checkout master . I get the message "On Branch Master Your branch is up-to-date with 'origin/master'. Nothing to commit, working directory clean." This is the same message that comes up when I do a git status. But then I do git pull , it pulls two changes to master. I checked git log and it seemed there was a new commit to master 3 minutes ago. Is there a lag with git status ? I just did a git status and it again says I am up-to