Git development
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: git@vger.kernel.org
Cc: David Woodhouse <dwmw2@infradead.org>,
	Linus Torvalds <torvalds@osdl.org>
Subject: History messup
Date: Mon, 09 May 2005 16:59:31 +0000	[thread overview]
Message-ID: <1115657971.19236.33.camel@tglx> (raw)

Hi,

I wrote a git repository tracker, which can track and coordinate
multiple git repositories. Before it goes public, I want to clarify a
problem which I encountered

The commit bfd4bda097f8758d28e632ff2035e25577f6b060 
by David Woodhouse (Thu May 5 12:59:37 2005 +100)  
Merge with
master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 

breaks the history.

David merged from Linus repository . Linus synced later with David.
Linus did not create a new commit for this update and just pointed his
"HEAD" to Davids "HEAD", which means he forked Davids repository at this
point.

Due to that the parent->parent history is not longer unique. This makes
it impossible to do file revision graphs over the various repositories
in the correct order.

Is this a unique problem or is the omission of a commit in cases like
that usual practice ? In the latter case proper history tracking is
almost impossible.

tglx



             reply	other threads:[~2005-05-09 16:51 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-05-09 16:59 Thomas Gleixner [this message]
2005-05-09 17:06 ` History messup Thomas Glanzmann
2005-05-09 18:05   ` Thomas Gleixner
2005-05-09 17:27 ` David Woodhouse
2005-05-09 17:48   ` Thomas Gleixner
2005-05-09 19:01     ` H. Peter Anvin
2005-05-09 19:06       ` David Woodhouse
2005-05-09 19:34         ` H. Peter Anvin
2005-05-09 22:08           ` Sean
2005-05-11 17:09             ` Thomas Gleixner
2005-05-11 20:31         ` Petr Baudis

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=1115657971.19236.33.camel@tglx \
    --to=tglx@linutronix.de \
    --cc=dwmw2@infradead.org \
    --cc=git@vger.kernel.org \
    --cc=torvalds@osdl.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