Victor Bogado da Silva LinsI have two git-svn repositories here and I noticed that the same commit have different ids in them. How this came to be, both commits share the exact same git-svn-id and are the same (as far as I know).
Victor Bogado da Silva Lins
Andreas EricssonRe: git-svn commit id.
Victor Bogado da Silva Lins wrote:
> I have two git-svn repositories here and I noticed that the same commit > have different ids in them. How this came to be, both commits share the > exact same git-svn-id and are the same (as far as I know). >
If the have exactly the same history leading up to them, source trees and commit object (including timestamps), the only way they can be any different is if you've run into a bug in the SHA1 libraries.
If either of the above three are different though, you *will* end up with different commits.
Try doing "git cat-file commit <sha1-of-one-commit>" and then "git cat-file commit <sha1-of-other-commit>". If you take a diff between the two, you'll see how they differ (my guess would be the timestamps)
-- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231
Re: git-svn commit id.
On Wed, May 28, 2008 at 4:41 PM, Andreas Ericsson <ae@op5.se> wrote:
Show 18 quoted lines
> Victor Bogado da Silva Lins wrote: >> >> I have two git-svn repositories here and I noticed that the same commit >> have different ids in them. How this came to be, both commits share the >> exact same git-svn-id and are the same (as far as I know). > > If the have exactly the same history leading up to them, source trees > and commit object (including timestamps), the only way they can be any > different is if you've run into a bug in the SHA1 libraries. > > If either of the above three are different though, you *will* end up > with different commits. > > Try doing "git cat-file commit <sha1-of-one-commit>" and then > "git cat-file commit <sha1-of-other-commit>". If you take a diff > between the two, you'll see how they differ (my guess would be the > timestamps) >
Git-svn uses the same timestamps as in svn, my guess is that one has more history than the other.
Santi
Victor Bogado da Silva LinsRe: git-svn commit id.
I studied the matter a lit bit and found out that there is an early commit that is different (in one repository if has lots deletions and in the other the diff is empty). This maybe an oddity of our svn repository that uses non-standard layout (atual in place of trunk, for instance).
On Wed, 2008-05-28 at 16:50 +0200, Santi Béjar wrote:
Show 24 quoted lines
> On Wed, May 28, 2008 at 4:41 PM, Andreas Ericsson <ae@op5.se> wrote: > > Victor Bogado da Silva Lins wrote: > >> > >> I have two git-svn repositories here and I noticed that the same commit > >> have different ids in them. How this came to be, both commits share the > >> exact same git-svn-id and are the same (as far as I know). > > > > If the have exactly the same history leading up to them, source trees > > and commit object (including timestamps), the only way they can be any > > different is if you've run into a bug in the SHA1 libraries. > > > > If either of the above three are different though, you *will* end up > > with different commits. > > > > Try doing "git cat-file commit <sha1-of-one-commit>" and then > > "git cat-file commit <sha1-of-other-commit>". If you take a diff > > between the two, you'll see how they differ (my guess would be the > > timestamps) > > > > Git-svn uses the same timestamps as in svn, my guess is that one has > more history than the other. > > Santi