Git development
 help / color / mirror / Atom feed
From: Bosko Ivanisevic <ivanisev@sezampro.com>
To: git@vger.kernel.org
Subject: Git and git-svn question.
Date: Fri, 28 Mar 2008 08:53:00 +0100	[thread overview]
Message-ID: <47ECA3DC.8010901@sezampro.com> (raw)

My company uses SVN and I have to work on the code from two offices. 
Since SVN is far away from git in branching I've decided to set up git 
repository as a mirror of company's SVN repo, which I would use as 
intermediate repository for my code:

git svn clone -t tags -b branches -T trunk 
svn+ssh://company_server/path_to_svn_repo --prefix=company/

Since I just started to use git I wonder if anyone can give me any hint
what is the best way to accomplish following tasks with git:

- In office 1 and office 2 I clone git repository that is a mirror of SVN:
   git clone ssh://company_server/path_to_git_repo

- I start new feature in office 1 based on the trunk version of SVN:
   git checkout -b new-feature company/trunk
	
- Work on this feature is not finished and, after few commits to the 
local 'new-feature' branch, I have to move to office 2.

- From office 1 I push local branch 'new-feature' to the git repository 
on company server.

- In office 2 pull changes and continue to work on 'new-feature' branch 
created from office 1.
	
- Commit everything in the git repository on company's server.

- Finally commit everything to the SVN repository.

             reply	other threads:[~2008-03-28 11:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-28  7:53 Bosko Ivanisevic [this message]
2008-03-28 11:27 ` Git and git-svn question Jean-Baptiste Quenot
2008-03-28 13:07   ` Bosko Ivanisevic
2008-03-28 14:38   ` Bob Cotton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=47ECA3DC.8010901@sezampro.com \
    --to=ivanisev@sezampro.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox