git-svn

What are the downsides to using the official Windows Git binaries from cygwin?

不问归期 提交于 2019-12-24 09:25:32
问题 Cygwin's latest git, svn and git-svn combination is stuck at old versions that have numerous git-svn bugs. I'm considering just downloading the official windows version (warning: this will start the a download: http://git-scm.com/download/win ), putting that in my path, and calling those binaries from Cygwin. What are the downsides to this? 回答1: Non-Cygwin Windows binaries won't be able to see Cygwin-style file paths. For example, your home directory might be /home/yourname as seen from

Git SVN clone with complex structure

 ̄綄美尐妖づ 提交于 2019-12-24 08:48:00
问题 I need to clone an SVN repository to git. The SVN repository is structured as if it's a repository of repositories, like so: SVNRepo |____ProjectA | |___branches | |___tags | |___trunk | file |____ProjectB | |___branches | |___tags | |___trunk file I need to clone the repository so that I end up with a single git repository, without the svn specific folders (branches, tags, trunk). I originally dumped then split the SVN repo into separate repos for each project and migrated to git using git

git-svn clone | spurious branches

好久不见. 提交于 2019-12-24 03:43:40
问题 I used the following command to clone svn repo into git and after executing it, i see some spurious branches. git svn clone [SVN repo URL] --no-metadata -A authors-transform.txt --stdlayout ~/temp git branch -a *(no branch) master remotes/abc-1.3.x remotes/abc-1.3.x@113346 remotes/abc-1.3.x@541512 remotes/branch_test_script remotes/tags/modules-1.2 remotes/tags/modules-1.2@113346 remotes/tags/modules-1.2@516265 remotes/tags/release-1.1 remotes/tags/release-1.1@113346 remotes/tags/release-1.1

Import separate SVN directories as git branches

不想你离开。 提交于 2019-12-23 17:53:15
问题 I want to convert an existing SVN repository with a nonstandard layout that looks like this: / (root) /trunk regular trunk stuff that I would like to make the "master" branch /folder1 files that I would like to make a separate branch "folder1" /folder2 files that I would like to make a separate branch "folder2" /folder3 files that I would like to make a separate branch "folder3" ... to a git repository, preserving history. The catch is that folder1 , folder2 , and folder3 are not branched off

The story of Git, Git-Submodule and a SVN server

孤街浪徒 提交于 2019-12-23 15:56:38
问题 First of all i want to show you my project setup, I've two projects Project X: Cloned from a remote svn server with git svn clone Project y: Located on GitHub Project X references Project y as git submodule: -- Project X -- src/ -- myCode1/ -- *Project y Submodule* -- myCode2/ -- .git/ -- ... Now I want to "push" my local done commits to the remote svn server with git svn dcommit. Can anyone explain me the correct workflow for that project structure? If I want to update my local git repo from

Relative paths for git-svn SVN authors file?

那年仲夏 提交于 2019-12-23 12:59:46
问题 I have cloned an SVN repository from work using git-svn. During the initial cloning, I provided an SVN authors file. When I did the initial clone, git set the authorsfile as an absolute path. However, I keep copies of this git repository on a work machine and a laptop, and keep the copies in sync using unison (they are not two different clones, but the same clone). The paths to my git repository are different on the work machine and the laptop, which means that the authors file won't be found

Relative paths for git-svn SVN authors file?

醉酒当歌 提交于 2019-12-23 12:59:20
问题 I have cloned an SVN repository from work using git-svn. During the initial cloning, I provided an SVN authors file. When I did the initial clone, git set the authorsfile as an absolute path. However, I keep copies of this git repository on a work machine and a laptop, and keep the copies in sync using unison (they are not two different clones, but the same clone). The paths to my git repository are different on the work machine and the laptop, which means that the authors file won't be found

How to undo the damage of autocrlf?

半世苍凉 提交于 2019-12-23 12:27:52
问题 I've been using git with autocrlf set to true for a while. I've been using it with git-svn through cygwin. It's been causing me a bunch of problems and I see here and here that I should probably turn it off. How can I "undo the damage" between trunk and master? 回答1: If you just want to fix it in a single commit and then leave it alone, you could do something like: find . -not \( -path ./.git -prune \) -type f -exec sed -i -e 's/\r//g' {} + Note: This will remove CRs from every file in the

Emulate subwcrev when using git-svn

僤鯓⒐⒋嵵緔 提交于 2019-12-23 07:56:20
问题 I use git-svn to interact with an existing SVN repository that contains some C++ projects. subwcrev.exe is used as a pre-build event to update some strings in a C++ header (svnversion.h). These strings get hardcompiled to form some version information for the resulting binary. Since subwcrev requires .svn metadata to work, the pre-build event is going to fail when used on the git-svn working copy. So I came up with the following bash script which I use as post-commit and post-checkout hooks

Which remote branches are my local git-svn branches bound to?

≯℡__Kan透↙ 提交于 2019-12-23 04:25:09
问题 I have the following .config file in my clone repo using git-svn: [core] repositoryformatversion = 0 filemode = false bare = false logallrefupdates = true symlinks = false ignorecase = true hideDotFiles = dotGitOnly [svn-remote "svn"] url = https://svn.domain.com:8443/svn fetch = trunk:refs/remotes/trunk branches = branches/{some_branch}:refs/remotes/branches/* When I do git branch -a , I get: $ git branch -a * master remotes/branches/some_branch remotes/trunk How do I know which remote the