From: Aaron Laws <dartme18@gmail.com>
To: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
Cc: git <git@vger.kernel.org>, Eric Wong <normalperson@yhbt.net>
Subject: Re: git-svn Rewrites Some Commits, but not All
Date: Thu, 1 May 2014 08:52:46 -0400 [thread overview]
Message-ID: <CADu-kvdVcdJk6+5-ELwti5SEJE5cHjTf+2AwMhfmAOFeYWT-sQ@mail.gmail.com> (raw)
In-Reply-To: <CAA01CsoWw2OxuO7e09u18b9-g8c2aavDNWPDE_TvG33-79nwMQ@mail.gmail.com>
Ah, I missed that dcommit entails a rebase. I thought it just
complained if one needed to take place, so I always do a rebase
"manually" before dcommit. I agree, and would not want my other refs
moved around if the change is that drastic.
The workaround is not so bad anyway: git reset on the left-behind
refs. Thanks for the replies!
In Christ,
Aaron Laws
On Tue, Apr 29, 2014 at 6:04 PM, Piotr Krukowiecki
<piotr.krukowiecki@gmail.com> wrote:
> On Mon, Apr 28, 2014 at 9:26 PM, Aaron Laws <dartme18@gmail.com> wrote:
>> The way I understand it, when `git svn dcommit` is run, new commits
>> are created (A' is created from A adding SVN information), then the
>> current branch is moved to point to A'. Why don't we move any other
>> refs that were pointing to A over to A' ? What would be the point of
>> continuing to point to A? I'm interested in looking into coding this
>> change to git-svn, but I would like to hear some feedback first.
>
> Hi,
>
> I think A' might not always be simply (A + SVN info). I think you can
> dcommit when you're not up to date. So A' will have a different
> parent than A (will be automatically rebased on top of current branch
> tip). Other refs pointing to A might be used as bookmarks, and moving
> them from A to A' would be a significant change.
>
> --
> Piotr Krukowiecki
prev parent reply other threads:[~2014-05-01 12:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-28 19:26 git-svn Rewrites Some Commits, but not All Aaron Laws
2014-04-29 22:04 ` Piotr Krukowiecki
2014-04-30 6:59 ` Eric Wong
2014-05-01 12:52 ` Aaron Laws [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=CADu-kvdVcdJk6+5-ELwti5SEJE5cHjTf+2AwMhfmAOFeYWT-sQ@mail.gmail.com \
--to=dartme18@gmail.com \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
--cc=piotr.krukowiecki@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).