Re: BUG: git rebase -i -p silently looses commits

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 11, 2009, 17:32 UTC
Message-ID: <alpine.DEB.1.00.0911111804520.19111@intel-tinevez-2-302>
In-Reply-To: <20091104214611.GL9139@dr-wily.mit.edu>

Hi,

On Wed, 4 Nov 2009, Greg Price wrote:

Show 12 quoted lines

> On Mon, 2 Nov 2009, Johannes Schindelin wrote:
> > Having said that, I worked for some time on fixing this issue, and I 
> > actually run a version of rebase -i -p here that allows reordering 
> > commits, but it is far from stable (and due to GSoC and day-job 
> > obligations, I had no time to work on it in months).
> 
> I'm interested in this topic too.  Some weeks ago I took your
> rebase-i-p branch from January and rebased it onto the latest release;
> it's at
>   git://repo.or.cz/git/price.git rebase-i-p
> and now based on v1.6.5.2.  I fixed a few bugs and added a feature,
> and it's the version I run day to day.

That is very interesting!

However, for rebase-i-p to have a chance to be accepted, I think a few things are necessary still (this is all from memory, so please take everything with a grain of salt):

- reorder the series to have the -i fixes first, the new commands next, 
  and then the changes to the actual -p mode

- rework the mark stuff so that 'todo' works properly, and then change the 
  system to use ':<name>' style bookmarks.

- fix that nasty bug which makes one revision not pass the tests (I forgot 
  which one, but it should be in the TODOs)

- add proper handling for the case when a patch has been applied in 
  upstream already, but was not correctly identified as that by 
  --cherry-pick (well, this TODO is actually not really related to rebase 
  -i -p, but something I deeply care about)

Unfortunately, I am getting more and more deprived of Git time budget these days, so that I cannot seem to find a few hours to at least restart my efforts.

Ciao, Dscho