From: "Kelvie Wong" <kelvie@ieee.org>
To: git@vger.kernel.org
Subject: git-svn rebase issues (the commiter gets changed)
Date: Thu, 22 Nov 2007 08:15:11 -0800 [thread overview]
Message-ID: <94ccbe710711220815j663d22e0v3c744244d0a87b66@mail.gmail.com> (raw)
When using git-svn rebase (I'm not sure if this happens with a regular
rebase as well, I use use git-svn primarily at work), the following
oddity happens:
kelvie@mudd (working) qt $ git-cat-file commit
c27e6207c9078d4225288d55454d6577f0135c16
tree 13d9ef9cc67f5e6381d7697e5794c0ab5f72c729
parent b9eb187d3029c5f9a816cb8f5473d9b239952d53
author kwong <kwong@e2d93294-a71b-0410-9dca-e2ea525a67c9> 1195596864 +0000
committer cscrimgeour
<cscrimgeour@e2d93294-a71b-0410-9dca-e2ea525a67c9> 1195691944 +0000
Qt/FME Extensions: QFMEDialog/QFMEWizard -> Windows only, for now
This is also a reapplication of r39657, which got rolled back.
These have dependencies on QWinWidget (which is a part of the MFC/Qt Migration
Solution), and thus, it does not build without it.
<kw>
kelvie@mudd (working) qt $ git-cat-file commit
7075991c67c6d409ec2315dfeef6f45dd328485b
tree 13d9ef9cc67f5e6381d7697e5794c0ab5f72c729
parent b9eb187d3029c5f9a816cb8f5473d9b239952d53
author kwong <kwong@e2d93294-a71b-0410-9dca-e2ea525a67c9> 1195596864 +0000
committer Kelvie Wong <Kelvie.Wong@safe.com> 1195747291 +0000
Qt/FME Extensions: QFMEDialog/QFMEWizard -> Windows only, for now
This is also a reapplication of r39657, which got rolled back.
These have dependencies on QWinWidget (which is a part of the MFC/Qt Migration
Solution), and thus, it does not build without it.
<kw>
These are both the exact same commit (the tree, parent, and author are
equivalent).
Sometimes (not always), the committer in a commit changes to be the
committer of the parent (svn) commit. This only happens to the
commits whose parent is the SVN commit. In the above example,
cscrimgeour is a SVN user, who obviously could not have changed my
code; the proper commit is the one at the bottom.
Both of these are the first local commit that I have rebased onto SVN.
--
Kelvie Wong
next reply other threads:[~2007-11-22 16:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-22 16:15 Kelvie Wong [this message]
2007-11-29 7:52 ` git-svn rebase issues (the commiter gets changed) Eric Wong
2007-11-29 16:16 ` Kelvie Wong
2007-12-16 3:27 ` Eric Wong
2007-12-16 3:39 ` Eric Wong
2007-12-16 5:50 ` Junio C Hamano
2007-12-18 17:16 ` Kelvie Wong
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=94ccbe710711220815j663d22e0v3c744244d0a87b66@mail.gmail.com \
--to=kelvie@ieee.org \
--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;
as well as URLs for NNTP newsgroup(s).