git-svn

Tips on using Git with svn in presence of a large number of svn externals

試著忘記壹切 提交于 2019-12-11 05:41:26
问题 I have a workflow(on svn) which I am trying to replicate with git, but am unable to. I have a large number of Django apps (which are plugged together to form a form a full project) Some of these are in one large repo and others are in smaller repos. My layout looks something like, app1 -> repo1/app1 app2 -> repo2/app2 app3 -> repo1/appp3 templates/app1 -> repo1/templates/app1 templates/app2 -> repo2/app2/templates/app2 templates/app3 -> repo1/templates/appp3 site_media/app1 -> repo1/media

Disconnected GIT branches after migrating from SVN

时间秒杀一切 提交于 2019-12-11 05:32:57
问题 Tried to see few dozen posts and still not getting what I want. Preface : We initially had a very big SVN repository with no trunk (standard structure) etc. So, the project I was working had no structure too (inside the sub-folder). I worked on this project for about couple of months and then came across a situation where I needed a branch for production fix. So, I restructured only my project code into trunk, tags and branches (i.e. sub-directory within the SVN repository). Then from history

Edit svn:externals with git svn

会有一股神秘感。 提交于 2019-12-11 04:53:49
问题 Is it possible to set svn:externals property using git svn propset ? I have successfully used git svn propset to set the svn:eol property. However, for svn:externals I am unsure if/how it can be done because svn:externals is a multi-line property, and I'm not sure if/how multiple lines of the property value may be expressed on the command line. For svn:externals , it would be ideal if the git svn propset command had an --edit option, which would allow the property to be edited in the text

How to keep local branch history with an atomic git-svn dcommit operation?

僤鯓⒐⒋嵵緔 提交于 2019-12-11 04:42:24
问题 I do my development of various features in git branches. When I want to check my code into SVN via git-svn, I do the following: git co feature_branch git svn rebase git co master git svn rebase git merge --no-ff feature_branch git commit --amend git svn dcommit This works reasonably well, unless another developer commits to SVN any time during this process, in which case either: If a SVN commit is made between the time I rebase feature_branch and master, I get a log that looks like the

git svn, how should I init my svn repo and synchronise with my existing git repo

半世苍凉 提交于 2019-12-11 03:28:28
问题 I have currently working git repo at url_git and new svn repo at url_svn. I want to use svn repo with git svn -plugin and I've cloned repo with: git svn clone --username user url_svn/project_svn and when I use for example git svn rebase or git svn dcommit It works just fine And when I try to push my git repo to svn git clone git_url/project_git cd project_git git svn init url_svn/project_svn Fetch: git svn fetch A initial_commit r1 = c9e1ab586b658f3f5518e3ed36e87ded675a4685 (refs/remotes/git

Incomplete data: Delta source ended unexpectedly while git svn fetch

三世轮回 提交于 2019-12-11 02:34:34
问题 I have cloned my svn repo into git and everyday i am doing git svn fetch (i only do changes in SVN) but i am planning to move to git and i keep the git repo in sync for the day since the svn clone tooke me 2 weeks (yeah it's a big repo). Anyway the git svn fetch has worked fine every day until 2 days ago where i now get Incomplete data: Delta source ended unexpectedly at /usr/lib/perl5/site_perl/Git/SVN/Ra.pm line 290 at a specific revision. I tried the different suggestions online about git

git: more efficient way to do this

China☆狼群 提交于 2019-12-11 02:19:42
问题 This is my normal workflow with git-svn: create a branch for an issue commit after doing some work on branch checkout master svn rebase checkout branch rebase master checkout master merge branch dcommit My goal here is to keep my history in a straight line, and also trying to minimize the headache of merges. Is there a way to do this with less steps? 回答1: There's no need to do your rebase in the middle, and certainly no need to swap to the master branch to do so. My workflow achieves the same

Single git-svn command not caching password for multiple svn actions

核能气质少年 提交于 2019-12-11 02:05:45
问题 I'm using git-svn to connect to a subversion repository that authenticates via https. I'm using the git command line client on Linux (Ubuntu 12.04). When I perform any command that requires interaction with the subversion server, I must enter my svn password, as expected. However, if the command requires multiple interactions with the svn server (e.g. git svn dcommit with multiple local commits) I must enter the password multiple times. On another workstation, I have a similar setup which

Files in gitignore

拟墨画扇 提交于 2019-12-10 23:19:19
问题 I have a repository with a rails app in the production Server. In the repo there is the .gitignore file: ... config/database.yaml ... Every developing client have a cloned repo with different config/database.yaml. My problem is this: database.yaml is in .gitignore, then when I run git clone (on the server) the database.yaml will not be created, but I need it. I thought than I am doing wrong something. Can you see where is my mistake ? thank you, Alessandro 回答1: In my projects, I usually make

Why is git-svn trying to use an old branch point?

放肆的年华 提交于 2019-12-10 23:19:07
问题 I'm trying to rely more heavily on git-svn for all my tasks, rather than just use git locally and then svn to handle server branches and tags. I did a brand new clone of my svn repository. I had to start from a fairly recent (300 revisions or so back) revision to prevent it taking days to clone. git svn fetch and git svn dcommit are all working fine. I'm trying to tag with our latest build number, 3.6.1. So to do a dry-run I issue: $ git svn tag -n -m "3.6.1 build" 3.6.1 Copying https:/