git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: git@vger.kernel.org
Subject: bisect / history preserving on rename + update
Date: Tue, 14 Aug 2007 10:38:01 +0200	[thread overview]
Message-ID: <1187080681.12828.174.camel@chaos> (raw)

Hi,

is there a built in way to handle the following situation:

file A is renamed to B
file A is created again and new content is added.

I found only two ways to do that, which both suck:

1)
	git-mv A B
	git-add A
	git commit

	results in a copy A to B and lost history of B

2)
	git-mv A B
	git commit
	git-add A
	git commit

	preserves the history of B, but breaks bisection because
	A is needed to compile

I have no real good idea how to solve this. After staring at the git
source for a while, I think that 1) is quite hard to solve. A sane
solution for 2) might be to add a flag to the second commit, which
bundles the two commits for bisection.

Any other solutions ?

	tglx

             reply	other threads:[~2007-08-14  8:38 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-14  8:38 Thomas Gleixner [this message]
2007-08-14  9:33 ` bisect / history preserving on rename + update Karl Hasselström
2007-08-14 10:16   ` Thomas Gleixner
2007-08-14 10:50     ` Karl Hasselström
2007-08-14 11:06       ` Thomas Gleixner
2007-08-14 11:12         ` David Kastrup
2007-08-14 11:18         ` Karl Hasselström
2007-08-14 14:19           ` Thomas Gleixner
2007-08-14 14:45             ` David Kastrup
2007-08-14 10:03 ` David Kastrup
2007-08-14 16:14 ` Linus Torvalds
2007-08-25  4:59   ` Junio C Hamano
2007-08-25  7:35     ` David Kastrup
2007-08-25 15:38     ` Linus Torvalds
2007-08-25 17:23       ` Junio C Hamano

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=1187080681.12828.174.camel@chaos \
    --to=tglx@linutronix.de \
    --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).