git-svn

Git blame on reorganized SVN repository

末鹿安然 提交于 2019-12-08 02:22:25
问题 git blame isn't showing me the all history of a SVN repository which had its layout reorganized. I'm using git-svn to access a SVN repository. The SVN repository used to have a structure with a vast tree of folders to hold the many projects. Last year I reorganized and flattened the layout into a more standard trunk/tags/branches layout. The result of which is that all the files in the repository were moved on 17th May 2010. Using the subclipse SVN client from Eclipse, I can do Team->Show

migrate svn to subdirectory of git

亡梦爱人 提交于 2019-12-07 22:32:21
问题 I'd like to replace my svn repository with git. Unfortunately I can't do this in one shot and to cut a long story short, I need to move an svn repository, with history, into a subdirectory of a pre-existing git repository. So I currently have: svn: svn1/ svn2/ git: git1/ .git/ gita/ And I want: svn: svn1/ git: git1/ .git/ gita/ svn2/ Any ideas on the best way to do this? 回答1: You can clone the svn repo with git-svn to preserve history and then merge it with the git repo. For example: git svn

git svn clone > git svn rebase > Unable to determine upstream SVN information from working tree history

允我心安 提交于 2019-12-07 17:04:09
问题 I am trying to keep a read-only checkout of ,http://googleappengine.googlecode.com/svn/trunk/python into a git repository, which is stored as remote in github. 1) $git svn clone http://googleappengine.googlecode.com/svn/trunk/python. 2) $git svn rebase -- Unable to determine upstream SVN information from working tree history So I started reviewing the .git/config file to fix this problem, and this where I am at: [svn-remote "svn"] fetch = :refs/remotes/git-svn url = http://googleappengine

Missing tags after SVN to Git conversion

試著忘記壹切 提交于 2019-12-07 15:26:33
问题 I'm trying to convert a Subversion repository to a Git repository using the following commands.: git svn clone URL_TO_SVN/PROJECT --authors-file=users.txt -T trunk -b branches -t tags/release The only thing that differs from the SVN standard layout is that the SVN tags stored under tags/release . After moving the SVN tags to be proper Git tags: cp -Rf .git/refs/remotes/origin/tags/release/* .git/refs/tags/ rm -Rf .git/refs/remotes/origin/tags I only get a few tags, but not all SVN tags are

git-svn branch - How to keep branch in sync with trunk?

江枫思渺然 提交于 2019-12-07 14:09:09
问题 There are plenty of questions about git-svn workflow, but I haven't been able to figure this one out: This section of the svn book talks about a common practice with SVN: you make a branch, and you keep merging changes from the trunk as the trunk gets updated, so that the branch always includes the latest changes. I did git svn branch to create a branch on svn and then set up a tracking branch to work on it. These questions cover the process pretty well. Now suppose there were changes made to

How can I recover a Subversion repository from a git-svn copy?

流过昼夜 提交于 2019-12-07 12:42:02
问题 I am pretty sure I have tried everything, figured I would ask all the gurus on here. Background: I had an SVN repository on an old linux box. I accessed this SVN repo with git-svn. The system's hard drive crashed and the SVN repo was lost. Question: Since I have an entire backup of the SVN repository on my local machine through me using GIT, I would like to figure out how to publish everything, including previous commits from my local machine to the new SVN server (that now is on a RAID 5

Git svn fetch and then commit to remote git

▼魔方 西西 提交于 2019-12-07 12:18:44
问题 My customer has a SVN repo and I would like to use git on my side instead. I used git-svn to create a git from my customer's svn and created a gitlab for it. If my customer changes something on his side I would like to fetch the changes and then update my gitlab to keep everything in sync. Currently I'm using: git svn fetch And if something was changed, I get a few changes. After receiving the changes I am still not able to push said changes to my git. git commit -am "Changed something"

After “git svn clone”, I still don't have fantastic branch-merging commit?

大兔子大兔子 提交于 2019-12-07 12:14:09
问题 After I did the git svn clone --stdlayout ... , everything looks good and I have converted remote branches. But when git log --graph , I don't see any branch merging graph. Is it normal? 回答1: Since version 1.5.0 released in summer of 2008 Subversion does support merge-tracking. Subversion keeps information on performed merges as svn:mergeinfo property set on merge target, be it a branch directory, like ^/trunk/ , or any other directory. There are major differences between merge-tracking

How to clone a nonstandard svn repo to git?

心不动则不痛 提交于 2019-12-07 06:36:36
问题 I try to clone a svn repo to git, but some of the branches are in the svn root dir like follows. I've tried $ git clone svn://url/svn-root -T trunk -b branches -b branch1 -b branch2 and $ git clone svn://url/svn-root -T trunk -b branches -b . Both are failed to clone the branch1 and branch2 correctly. Please help. svn-root ├── branch1 ├── branch2 ├── branches │ ├── branch3 │ └── branch4 └── trunk 回答1: One interesting tool, mentioned in GitMinutes Episode 20, is SubGit, a plugin for Atalssian

git-svn after an SVN repository is moved?

て烟熏妆下的殇ゞ 提交于 2019-12-07 06:34:57
问题 We recently moved our SVN server from one data center to another, and the IP of the server has changed. I used svn switch --relocate old_url new_url to update my actual working copy, and that was happy. However, I do most of my work in a local git version of the repository (using git-svn, obviously). After moving the SVN server, I updated the URL for the repo in .git/config , but when I try to use dcommit , I receive this error: Unable to determine upstream SVN information from HEAD history.