You are not logged in.

#1 2014-05-13 07:32:15

Archdove
Member
Registered: 2011-09-23
Posts: 118

Looking for Git concept to work around my problem

Hi

I'm modifying some open source software which i checked out from SVN. Lets call the project "original". I cannot modify the SVN repo, only update from it.
In order to keep changes to the original project i've wrapped around a Git repository in which i only add files modified from the original repo.

git-repo/original

Now i have the following problem:
1. i update the original source by svn update && svn reverting
2. i want to apply the changes from git and i need it to apply them in favor to the git repository so my changes wont get lost.

I tried around with updating, stashing and stuff but i couldn't find a simple solution to my problem.

So maybe you have some experiance with this kind of setup and you can point me to the right direction.

Regards,
Archdove

Offline

#2 2014-05-13 22:40:53

chipper
Member
Registered: 2014-05-06
Posts: 2

Re: Looking for Git concept to work around my problem

http://git-scm.com/book/en/Git-and-Othe … Subversion

Could this be what you are looking for? It should be built into git. Man Page

Offline

#3 2014-05-15 09:25:20

vkumar
Member
Registered: 2008-10-06
Posts: 166

Re: Looking for Git concept to work around my problem

Perhaps you could create a patch using git diff and apply it onto your svn repo. A more long-term solution might be git-svn (I see chipper has already linked you to it).


div curl F = 0

Offline

#4 2014-05-15 11:31:23

Trilby
Forum Moderator
From: Massachusetts, USA
Registered: 2011-11-29
Posts: 13,698
Website

Re: Looking for Git concept to work around my problem

Why not just keep your revisions under svn?  That would be far simpler.

Otherwise, if you must use git for your version, you can treat the changes to the svn original/upstream simply as another contributor and - as needed - merge their changes with yours.  Git will do this 'automagically' where possible - and where not it is likely that there would be no way around manual intervention.


InterrobangSlider
• How's my coding? See this page.
• How's my moderating? Feel free to email any concerns, complaints, or objections.

Offline

#5 2014-05-15 12:01:59

bulletmark
Member
From: Brisbane, Australia
Registered: 2013-10-22
Posts: 241

Re: Looking for Git concept to work around my problem

What you want is already built into git natively as git svn. It does exactly what you are asking for, works well, and is simple to use. Any time I encounter a legacy svn repo I use git svn to check it out, manage, and submit my changes back to the repo.

Offline

#6 2014-05-15 12:30:08

esdaniel
Member
From: Paris
Registered: 2010-02-01
Posts: 57
Website

Re: Looking for Git concept to work around my problem

Noting @Bulletmark's advice you will probably find this useful:
https://blogs.atlassian.com/2013/12/git … nd-tricks/

Offline

#7 2014-05-20 14:57:50

Archdove
Member
Registered: 2011-09-23
Posts: 118

Re: Looking for Git concept to work around my problem

This is the repository that i want to check out. but git can't do it. It scans for revision forever.

git svn clone http://svn.apache.org/repos/asf/ofbiz/b … lease13.07 ofbiz.13.07

Could someone who has done this before check if i am the problem or if the repo is strangely configured?

Offline

#8 2014-05-27 14:44:19

esdaniel
Member
From: Paris
Registered: 2010-02-01
Posts: 57
Website

Re: Looking for Git concept to work around my problem

$ git svn clone -r HEAD http://svn.apache.org/repos/asf/ofbiz/branches/release13.07

Offline

Board footer

Powered by FluxBB