告诉emacs VC,当文件在两个版本系统下时,我想要一个文件由git而不是由svn管理? [英] Howt to tell emacs VC that I want a file to be managed by git not by svn when the file is under both version systems?
问题描述
GIT-master
。但是当我编辑由svn(对于稳定的提交和组VC)和git(对于我自己和之间的提交)管理的文件时,我不知道如何强制使用git完成提交(状态说那是一个svn文件)。任何想法? 我可以随时使用 M-! git状态
M-! git添加
等,但是具有VC快捷方式并将差异集成在emacs中是非常好的。
注意:我没有使用git-svn 。。这是一个已经是svn的分支检查,我想让一些实验更改由git控制,直到代码变得稳定,而不是做一个svn子分支。我相信,git-svn将会是要走的路,但不幸的是,我需要找到时间来阅读并安装任何需要的东西。所以我正在使用我已经知道的简单的git。
您可以自定义 vc-handling -backends
并将Git移动到Subversion之上。你应该真的只是尝试使用 git-svn
您可以使用 git rebase -i
或 git merge --squash
将一堆Git更改集合(squash)一个Subversion修订版。
I was using until now emacs21 with git.el, so it was not a problem but now with emacs22 git management is integrated in VC so I manage my git files with vc-git. That is ok when the files are only manged by git. I can see a GIT-master
in the status. But when I am editing files managed by both svn (for the stable commits and group VC) and git (for my own and in-between commits) I don't know how to force the commits to be done with git (the status say that is a svn file). Any idea?
I can always use the M-! git status
M-! git add
etc but having the VC shortcuts and integrating the diff in emacs is very nice.
note: I am not using git-svn at the moemnt. This is an already svn branch checkout that I want to have some experimental changes been controlled by git until the code becomes stable, instead of doing a svn sub-branch. I believe that the git-svn would be the way to go but unfortunately I need to find the time to read about it and install whatever is needed. So I am using what I already know that is simple git.
You can customize vc-handled-backends
and move Git above Subversion. You should really just try using git-svn
though; you can use git rebase -i
or git merge --squash
to collapse (squash) a bunch of Git changesets into a single Subversion revision.
这篇关于告诉emacs VC,当文件在两个版本系统下时,我想要一个文件由git而不是由svn管理?的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!