Re: 'next' will be rewound shortly

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Stephan Beyer
Date: Friday, June 27, 2008 - 9:12 am

Hi Junio,


I wonder why the bugfix commit

	aec7e9cd	Don't append default merge message to -m message

has disappeared or why/if this belongs to js/rebase-i-sequencer.

I noticed this because a test case of sequencer failed during rebasing
to pure "master"/"next" without js/rebase-i-sequencer.


I also have a question:
my development branch for the sequencer prototype is based on next,
then:
	* Merge js/rebase-i-sequencer
	* ... development ...

The only reason that makes js/rebase-i-sequencer important (besides
aec7e9cd which is mentioned above), is for the last patch
("Migrate rebase-i to use sequencer") in the patchset that I want to
send to the list.  (Otherwise a lot of work of Joerg Sommer would be
annotated to me.)
So I wanted to
 1. send a patchset based on "master"/"next" without the rebase-i
    feature extentions of Joerg Sommer, and
 2. resend the last patch (the one about rebase-i) based on "pu",
    where js/rebase-i-sequencer is still merged into.
Is this sane?

(The other variant could be that I send the "Merge js/rebase-i-sequencer"
 commit as a patch to the list, but this sounds insane to me.)

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:
[ANNOUNCE] GIT 1.5.6, Junio C Hamano, (Wed Jun 18, 4:24 pm)
A note from the maintainer, Junio C Hamano, (Thu Jun 19, 12:24 am)
'next' will be rewound shortly, Junio C Hamano, (Thu Jun 19, 2:17 am)
Re: [ANNOUNCE] GIT 1.5.6, Steffen Prohaska, (Sun Jun 22, 9:54 am)
[ANNOUNCE] GIT 1.5.6.1, Junio C Hamano, (Wed Jun 25, 11:21 pm)
Re: 'next' will be rewound shortly, Stephan Beyer, (Fri Jun 27, 9:12 am)
Re: 'next' will be rewound shortly, Miklos Vajna, (Fri Jun 27, 9:34 am)
Re: 'next' will be rewound shortly, Stephan Beyer, (Fri Jun 27, 10:19 am)
Re: 'next' will be rewound shortly, Miklos Vajna, (Fri Jun 27, 12:28 pm)
Re: 'next' will be rewound shortly, Junio C Hamano, (Fri Jun 27, 2:28 pm)
Re: 'next' will be rewound shortly, Miklos Vajna, (Fri Jun 27, 2:36 pm)
Re: 'next' will be rewound shortly, Stephan Beyer, (Fri Jun 27, 4:41 pm)
Re: [ANNOUNCE] GIT 1.5.6.1, Steffen Prohaska, (Tue Jul 1, 4:29 am)
A note from the maintainer, Junio C Hamano, (Sun Jul 13, 10:51 pm)