Re: RFC: grafts generalised

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Stephen R. van den Berg <srb@...>
Cc: <git@...>, Mike Hommey <mh@...>, Michael J Gruber <michaeljgruber+gmane@...>
Date: Wednesday, July 2, 2008 - 3:31 pm

Hi,

I'm somehow quite confused about the desired workflow but I try an
answer.

Stephen R. van den Berg wrote:

If I got the problem right, it is possible.
But you have to rewrite and cannot just fake history, of course.
And, as Michael wrote:

...for example, a "pick <commit>" that just picks the _tree_ of the
commit and not the _introduced changes_. (I've never used info/grafts,
but if I get the principle right, such tree-picks could realize a
linear list of info/grafts history fakes.)

Stephen wrote earlier:

Hm, imho sequencer is well-suited for "non-parameterable" stuff.


The "pick" instruction (onto the new parent) is your friend.


"merge" instruction ;)


sequencer doesn't allow to change committer data, but this could
be an easy change if you really need that.
The same with the author timestamp, that could only be reused from
an old commit by using -C option on pick.


"pause" instruction, and then do manual changes, then
	git sequencer --continue

Stephan has also written:

I wonder if grafts can be used in combination with sequencer in such a
way that you rewrite foo~20000..foo~19950 and then fake the parents of
foo~19949 to be the rewritten once.


You can run gitk whenever you did "pause" in the sequencer file.
[Btw, an integration of sequencer into gitk is also on the TODO list,
 but that's OT here.]

Regards,
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
RFC: grafts generalised, Stephen R. van den Berg, (Wed Jul 2, 10:35 am)
Re: RFC: grafts generalised, Petr Baudis, (Wed Jul 2, 8:13 pm)
Re: RFC: grafts generalised, Petr Baudis, (Wed Jul 2, 8:16 pm)
Re: RFC: grafts generalised, Junio C Hamano, (Wed Jul 2, 8:28 pm)
Re: RFC: grafts generalised, Dmitry Potapov, (Wed Jul 2, 1:19 pm)
Re: RFC: grafts generalised, Stephen R. van den Berg, (Wed Jul 2, 1:59 pm)
Re: RFC: grafts generalised, Dmitry Potapov, (Wed Jul 2, 1:58 pm)
Re: RFC: grafts generalised, Stephen R. van den Berg, (Wed Jul 2, 2:10 pm)
Re: RFC: grafts generalised, Johannes Sixt, (Thu Jul 3, 2:02 am)
Re: RFC: grafts generalised, Stephen R. van den Berg, (Thu Jul 3, 3:30 am)
Re: RFC: grafts generalised, Johannes Sixt, (Thu Jul 3, 3:42 am)
Re: RFC: grafts generalised, Stephen R. van den Berg, (Thu Jul 3, 5:37 am)
Re: RFC: grafts generalised, Dmitry Potapov, (Wed Jul 2, 4:39 pm)
Re: RFC: grafts generalised, Junio C Hamano, (Wed Jul 2, 5:27 pm)
Re: RFC: grafts generalised, Junio C Hamano, (Wed Jul 2, 5:49 pm)
Re: RFC: grafts generalised, Junio C Hamano, (Wed Jul 2, 8:03 pm)
Re: RFC: grafts generalised, Stephen R. van den Berg, (Wed Jul 2, 5:18 pm)
Re: RFC: grafts generalised, Avery Pennarun, (Wed Jul 2, 5:28 pm)
Re: RFC: grafts generalised, Dmitry Potapov, (Wed Jul 2, 2:33 pm)
Re: RFC: grafts generalised, Jakub Narebski, (Wed Jul 2, 12:35 pm)
Re: RFC: grafts generalised, Stephen R. van den Berg, (Wed Jul 2, 1:32 pm)
Re: RFC: grafts generalised, Jakub Narebski, (Thu Jul 3, 8:43 pm)
Re: RFC: grafts generalised, Petr Baudis, (Wed Jul 2, 8:21 pm)
Re: RFC: grafts generalised, Stephen R. van den Berg, (Thu Jul 3, 3:11 am)
Re: RFC: grafts generalised, Michael J Gruber, (Wed Jul 2, 12:43 pm)
Re: RFC: grafts generalised, Stephen R. van den Berg, (Wed Jul 2, 1:42 pm)
Re: RFC: grafts generalised, Andreas Ericsson, (Mon Jul 7, 2:28 am)
Re: RFC: grafts generalised, Stephen R. van den Berg, (Mon Jul 7, 2:59 am)
Re: RFC: grafts generalised, Mike Hommey, (Wed Jul 2, 2:25 pm)
Re: RFC: grafts generalised, Stephen R. van den Berg, (Wed Jul 2, 2:37 pm)
Re: RFC: grafts generalised, Stephan Beyer, (Wed Jul 2, 3:31 pm)
Re: RFC: grafts generalised, Dmitry Potapov, (Wed Jul 2, 4:42 pm)
Re: RFC: grafts generalised, Stephan Beyer, (Wed Jul 2, 7:46 pm)
Re: RFC: grafts generalised, Stephen R. van den Berg, (Thu Jul 3, 2:05 am)
Re: RFC: grafts generalised, Stephan Beyer, (Wed Jul 2, 3:36 pm)
Re: RFC: grafts generalised, Michael J Gruber, (Wed Jul 2, 2:34 pm)