Kelvie Wong <kelvie@xxxxxxxx> wrote: > 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 This is strange. Does this commit end below? or did you truncate the git-svn-id: line from this message? > > 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@xxxxxxxx> 1195747291 +0000 This commit hasn't made it into SVN, yet, right? If so, then that's alright. > > 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. Did you get these commits by cherry-picking (or format-patch + am) from another SVN branch? Have these commits been made to SVN already? `gitk --reflog --all' may reveal some answers or clarify things for you (assuming you have reflogs enabled in .git/config). Rebase (all forms of it) *does* rewrite committer info, but how you got cscrimgeour in there is very strange to me. -- Eric Wong - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
