All of lore.kernel.org
 help / color / mirror / Atom feed
From: Russ Brown <pickscrape@gmail.com>
To: git@vger.kernel.org
Subject: git-svn: Branching clarifications
Date: Fri, 07 Sep 2007 11:47:17 -0500	[thread overview]
Message-ID: <46E18095.60501@gmail.com> (raw)

I have a few questions about how/when to use git branches when using
git-svn (I'm a tad confused...)

Say I've initialised and fetched a git repo involving trunk and one
branch (say branch1) from an svn repository.

If I do git branch -a, I see similar to the following:

* master
  branch1
  trunk

(branch1 and trunk are in red for me, which I figure means they're
remotely tracked or something like that?)

OK, so that's telling me that I currently have master checked out into
my working copy. My question is: where did master come from? Is it a
local branch of trunk?

Moving on, say I want to work on branch1. Can I simply issue git
checkout branch1? If I do so I get this:

$ git branch -a
* (no branch)
  master
  branch1
  trunk

Which is a bit scary. It seems my working copy is orphaned...

OK, so let's assume I'm supposed to create a local branch of each remote
branch I want to work on. So:

$ git branch local/branch1 branch1
$ git checkout local/branch1

$ git-branch -a
* local/branch1
  master
  branch1
  trunk

Am I supposed to have used --track when creating  this branch? What are
the implications for specifying or not specifying that flag when using
git-svn?

So I do some editing on this branch, commit and dcommit. The changes
appear as expected in the repo.

At this point if I checkout master, the contents look like
local/branch1, which isn't what I'd suspected (that it would be a branch
of trunk). What does master represent?

So I checkout local/trunk, and create a new file, commit and dcommit.
Umm, it's been committed to branch1 on the repo: not trunk,

So I figure I'm quite obviously doing something wrong here. Could
someone give me a hand and tell me what it is I'm getting wrong?

Thanks!

-- 

Russ

             reply	other threads:[~2007-09-07 16:47 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-07 16:47 Russ Brown [this message]
2007-09-08  5:21 ` git-svn: Branching clarifications Eric Wong
2007-09-08  6:57   ` David Kastrup
2007-09-08  7:49     ` Eric Wong
2007-09-08  7:58       ` David Kastrup

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=46E18095.60501@gmail.com \
    --to=pickscrape@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.