Git development
 help / color / mirror / Atom feed
From: Michael Norman <mwnorman@gmail.com>
To: git@vger.kernel.org
Subject: git-svn: after fetch , move 'remotes/git-svn' commits to be under  'master' ?
Date: Tue, 1 Dec 2009 11:18:05 -0500	[thread overview]
Message-ID: <d43c95440912010818j3c0b98e0o504f82c666c7a290@mail.gmail.com> (raw)

I don't know if following work-flow makes sense, but here it is:

step 0) clone a (very!) large SVN repository: since --depth=1 doesn't
work for git-svn clone,
pick the revision manually. In this case, I picked the revision one
behind HEAD, so I have
only 2 commits in my working copy:

yellow-dot - master
    |
blue-dot    - misc. tweak settings
    |
blue-dot    - bug 295xx - fix

step 1) I then created a few local branches off of master - br1, br2, etc.
           Some local commits are created under each branch

Pick up latest_&_greatest revisions from SVN
step 2) git svn fetch (about ~50 commits)
           These all identify their branch as 'remotes/git-svn'

It is possible to move the fetched commits to be under 'master'? My
local branch commits
do not overlap (adding new functionality only), so if the new commits
are moved to be under
master, then branches br1 and br2 will inherit those changes - correct?

Any advice would be greatly appreciated -  say if for example my work
flow is all wrong and
there is a better way to keep in sync with the remote SVN repository
while still commiting local
work in my working-copy tree

Mike Norman

                 reply	other threads:[~2009-12-01 16:18 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=d43c95440912010818j3c0b98e0o504f82c666c7a290@mail.gmail.com \
    --to=mwnorman@gmail.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