I am evaluating git–svn and trying to determine how well it will play with a particular svn repository. I am mostly concerned with getting git-svn to perform merges in such a way that the svn:mergeinfo property is correctly set in the subversion repo. Is this possible? Here is what I have done so far: # […]
I’ve got a ‘git–svn‘ working tree. I’d like to clone a “pure” git repo off this, and then use git push/pull to move changes between the git-svn tree and the git tree, while also using ‘git svn dcommit/rebase’ to move changes between the git-svn tree and the SVN repo it’s based on. This seems to […]
What’s the best method to notify other developers when a change committed into revision control requires some specific additional action by the developer getting the update e.g. modify a local config file not in version control? I’m currently writing it in the commit message, but it seems like this could easily be missed. Do any […]
I’ve heard for instance that merging branches with git or mercurial is easier than with svn. Reading last Joel on software blog entry, I didn’t get it exactly why. Could you provide a concrete example where merging with git/mercurial lead to less merge conflicts compared to svn please?
I have a repository which I have already cloned from SVN. I’ve been doing some work in this repository in its Git form and I would hate to lose that structure by cloning again. However, when I originally cloned the repository, I failed to correctly specify the svn.authors property (or a semantically-similar option). Is there […]
Despite all the links I’ve found on how to configure git/nginx to get my repos, I can’t make them work. I followed this tutorial, Git repository over HTTP WebDAV with nginx, but the user/password restriction doesnt’ work. Anyone can clone the repository. I’m from a configuration using SVN + Apache + DAV_SVN, with a file […]
Is there any way to get a patch created with git format-patch to be svn compatible so that I can submit it to an svn repo? I’m working off an svn repo on github and want to submit my changes back to the main repo. I need to create a patch to do this, however […]
I’m practicing how to use svn and git. I created a svn repository on my computer, at “/Users/name/svnRepo/test”. I am able to use the svn commands to work on this repository. Then, I tried to use command “git-svn clone FILE:///Users/name/svnRepo/test/ .”, and got an error: Initialized empty Git repository in … Bad URL passed to […]
I have a problem when I try to do a git svn rebase on my repository. It displays : Checksum mismatch: code/app/meta_appli/app_info.py expected: d9cefed5d1a630273aa3742f7f414c83 got: 4eb5f3506698bdcb64347b5237ada19f I searched a lot but haven’t found a way to solve this problem. If anybody knows, please share your knowledge. Thanks in advance.
A word of warning: I’m a n00b to git in general. My team uses feature branches in svn, and I’d like to use git-svn to track my work on a particular feature branch. I’ve been (roughly) following Andy Delcambre’s post to set up my local git repo, but those instructions seem to have led git […]