emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522.


From: Eli Zaretskii
Subject: Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522.
Date: Wed, 01 Oct 2014 18:49:13 +0300

> Date: Wed, 01 Oct 2014 18:45:14 +0300
> From: Eli Zaretskii <address@hidden>
> Cc: address@hidden, address@hidden, address@hidden
> 
> > * Imagine a mergy graph on the branch being cherry-picked from. How do
> > you revert that mergy clump? What if there are merges from that into
> > the current branch?
> > 
> > ---o---o---o---o---o---o A
> >     \     /
> >      o---o---o---o B
> >       \     /
> >        o---o
> 
> Well, figure it out, and you get my thumbs-up!

Btw, it's a bit ironic that while there's a lot of pressure to rebase
branches instead of merging them, when these issues are discussed,
suddenly all kind of complex DAGs pop up all over the place.  If
rebasing is the word of the day, then you will almost never see such
DAGs.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]