From: Jehan Bing <jehan@orb.com>
To: git@vger.kernel.org
Cc: Stephen Duncan Jr <stephen.duncan@gmail.com>
Subject: Re: git-svn branches with revision id's in name
Date: Thu, 02 Feb 2012 11:03:21 -0800 [thread overview]
Message-ID: <4F2ADDF9.9090507@orb.com> (raw)
In-Reply-To: <4F2A807B.9050206@T-Online.de>
On 2012-02-02 04:24, Carsten Fuchs wrote:
> Hi all,
>
> Am 2012-01-30 20:42, schrieb Stephen Duncan Jr:
>> [...]
>> $ git branch -a
>> * master
>> remotes/develop
>> remotes/develop@29271
>> remotes/develop@32463
>> remotes/develop@34103
>> remotes/feature/xyz
>> remotes/feature/xyz@26438
>> remotes/feature/xyz@27542
>> remotes/feature/xyz@35233
>>
>> Why have these remote branches been created? What impact does this
>> have on my checkout? Can I remove safely remove them? How? I was
>> unable to figure out how to reference this behavior in order to search
>> for information on it.
>
> Same questions here.
> (I know how to remove them, but I'd love to learn and understand why
> they have been created.)
Those are branches that have been deleted and then recreated later.
In svn, you can always get a deleted branch back by checking out an old
revision. But in git, branches are not part of the history, so when you
delete a branch, it's completely gone, as if it never existed, taking
with it any commit that has not been merged elsewhere.
To prevent that loss, git-svn doesn't delete branches. But if the branch
was re-created later in svn, you would get a conflict in git. So
instead, git-svn rename the old branch by adding the revision number
where the branch last existed, i.e. the revision before it was deleted.
So in the OP case, the branch "develop" was deleted at least 3 times, at
r34104, r32464 and r29272. The last one may also have been deleted too
but then it was not re-created so git-svn didn't rename yet.
prev parent reply other threads:[~2012-02-02 19:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-30 19:42 git-svn branches with revision id's in name Stephen Duncan Jr
2012-02-02 12:24 ` Carsten Fuchs
2012-02-02 19:03 ` Jehan Bing [this message]
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=4F2ADDF9.9090507@orb.com \
--to=jehan@orb.com \
--cc=git@vger.kernel.org \
--cc=stephen.duncan@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).