Re: [PATCH/RFC 01/10] Teach rebase interactive the mark command

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Apr 14, 2008, 14:10 UTC
Message-ID: <alpine.DEB.1.00.0804141506270.28504@racer>
In-Reply-To: <69a88a530804131351n7d9f8188vf2bbb0174ade3ca0@mail.gmail.com>

Hi,

On Sun, 13 Apr 2008, Paul Fredrickson wrote:

Show 14 quoted lines

> > Jrg Sommer <joerg@alea.gnuu.de> wrote:
> > > > Wouldn't
> > > >
> > > > pick 5cc8f37 (init: show "Reinit" message even in ...)
> > > > mark 1
> > > > pick 18d077c (quiltimport: fix misquoting of parse...)
> > > > mark 2
> > > > reset 1
> > >
> > > "reset 18d077c~2" or "reset some-tag" or "reset my-branch~12"
> > >
> > >         merge #2
> > > >
> > > > be easier for people?

Actually, I think that this whole "mark" stuff is way too complicated, as can be seen by the amount of patches needed to get it somewhere usable.

I would like it much better, if there was something like

pick 5cc8f37 (init: show "Reinit" message even in ...) pick 18d077c (quiltimport: fix misquoting of parse...) merge 9876543:5cc8f37,18d077c (Merge blub) reset 5cc8f37 ...

I.e. like with filter-branch, and like with rebase -i -p in its current form, we take the _original_ names as keys as to which commits to merge, or where to reset to.

That would be relatively easy to implement, since the whole infrastructure for it is already there: whenever a commit was rewritten, the new commit name is saved in $DOTEST/rewritten/<original-commit-name>.

I really do not like complicating things unnecessarily.

Ciao, Dscho