[Kde-scm-interest] Git roadmap

[Thiago Macieira]

Oswald Buddenhagen wrote:
>On Tue, Sep 18, 2007 at 09:27:45PM +0200, Thiago Macieira wrote:
>> In Git, you can copy the history along and insert it with the proper
>> authors, commit dates, etc.
>
>does this imply that checkouts of previous revisions are altered?  you
>can't get it right either way ... if old versions are not changed and
>the dates are kept, searching by date produces inconsistent results. if
>dates are altered, it simply makes no sense. and if old versions are
>altered, things are completely screwed anyway. fourth possibility?

No.

You're simply adding a new commit on top of the existing commits. But, 
along with it, you bring in a parallel history that gets merged.

Your commit tree will look like: [view with fixed-width font]

  ..... o--o--o--o--o--o--X--o--o
                         /
              o--o--o--o

Where X marks the "copy with history" commit. It's a simple merge commit 
in the Git sense of the word: a commit with more than one parent. As you 
can see from the second tree, it shares no commits with the original 
tree.

Your original tree is still there, nothing changed on it. The new commits 
were introduced in parallel, with their dates going back years if 
necessary, authors preserved.

-- 
  Thiago Macieira  -  thiago (AT) macieira.info - thiago (AT) kde.org
    PGP/GPG: 0x6EF45358; fingerprint:
    E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://mail.kde.org/pipermail/kde-scm-interest/attachments/20070919/21954f3d/attachment.pgp