emacs-devel
[Top][All Lists]
Advanced

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

Re: Emacs seems awfully unstable on OS X lately


From: Stephen J. Turnbull
Subject: Re: Emacs seems awfully unstable on OS X lately
Date: Sat, 15 Sep 2012 18:37:38 +0900

Óscar Fuentes writes:

 > Harald Hanche-Olsen <address@hidden> writes:
 > 
 > > ACtually, I could a bit of help with that: Since I have a range of
 > > more than 500 revisions to bisect, I think the most efficient
 > > procedure would be to create a branch that is identical to trunk
 > > except that revision 109470 is not applied, and then to bisect that.
 > > But I don't understand bzr well enought to know how to do that. Can
 > > someone tell me a good way to do it?
 > 
 > AFAIK there is no simple way of doing that.

Cherrypicking, like so:

bzr branch --revision=109469 trunk no-109470
cd no-109470
bzr merge --revision 109471..last:0 ../trunk

should do the trick.  There's no way to identify the merged revisions
with their upstream sources so you can never merge no-109470 back into
trunk normally (of course you can reverse cherrypick, but this gets
tedious right quick).  Just use no-109470 to identify the issue and
discard it as soon as possible.

See bzr help merge for a tiny bit more background on cherrypicking.

Steve



reply via email to

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