use case, advices (SVN/GIT)

Mihamina Rakotomandimby· Apr 22, 2010, 12:14 UTC · lore

Manao ahoana, Hello, Bonjour,

We'd rather use GIT. But there is a project, that we regularily pull (Coova: http://coova.org/CoovaChilli/Developers) which is under SVN.

I first "svn export" this project. I initiate a new GIT repository based on what I "exported". I make my changes, and commit them.

I month (and several commits) later, I would like to sync with Coova SVN.

It's a one way "pull": I wont push my changes to their repository.

What's your recommended way to handle this?

Misaotra, Thanks, Merci.

-- 
       Architecte Informatique chez Blueline/Gulfsat:
    Administration Systeme, Recherche & Developpement
                +261 34 29 155 34 / +261 33 11 207 36

Ulrich Spörlein· Apr 23, 2010, 15:25 UTC · re: Mihamina Rakotomandimby · lore

Re: use case, advices (SVN/GIT)

On Thu, 22.04.2010 at 15:14:01 +0300, Mihamina Rakotomandimby wrote:

Show 9 quoted lines

> Manao ahoana, Hello, Bonjour,
> 
> We'd rather use GIT.
> But there is a project, that we regularily pull (Coova:
> http://coova.org/CoovaChilli/Developers) which is under SVN.
> 
> I first "svn export" this project.
> I initiate a new GIT repository based on what I "exported".
> I make my changes, and commit them.

Use git-svn(1) to clone the branch you want to track

$ git svn init -Ttrunk URL

now you have a master branch that is set up to track the svn trunk. I'd recommend to put your commits into a different branch though and keep 'master' clean.

> I month (and several commits) later, I would like to sync with Coova
> SVN.

$ git svn rebase will fetch all new svn commits and put them in remotes/trunk, master is then forwarded accordingly.

Rebase your work on top of master now $ git rebase master mybranch

> It's a one way "pull": I wont push my changes to their repository.
> 
> What's your recommended way to handle this?

git-svn, see above.

Uli