From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nick Dokos Subject: Re: Invalid function: with-parsed-tramp-file-name with Perl Date: Thu, 20 Sep 2012 18:26:55 -0400 Message-ID: <18599.1348180015@alphaville> References: <87hau4ubgp.fsf@slate.zedat.fu-berlin.de> <7708.1340286834@alphaville> <87a9zwvhtp.fsf@slate.zedat.fu-berlin.de> <8083.1340291591@alphaville> <87395jub00.fsf@slate.zedat.fu-berlin.de> <877grro2av.fsf@slate.zedat.fu-berlin.de> <87haqupgfx.fsf@bzg.ath.cx> <87k3vqfjkd.fsf@slate.zedat.fu-berlin.de> <87wqzql4e6.fsf@bzg.ath.cx> <87boh2fgqu.fsf@slate.zedat.fu-berlin.de> <6364.1348062546@alphaville> <878vc5n8uu.fsf@Rainer.invalid> <9580.1348084284@alphaville.americas.hpqcorp.net> <87a9wkwzpa.fsf@slate.zedat.fu-berlin.de> <10076.1348153868@alphaville> <11268.1348155026@alphaville> <13825.1348161712@alphaville> <14004.1348162579@alphaville> <87sjacy031.fsf@Rainer.invalid> <17209.1348174264@alphaville> <87obl0xvdo.fsf@Rainer.invalid> Reply-To: nicholas.dokos@hp.com Return-path: Received: from eggs.gnu.org ([208.118.235.92]:51772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEpD7-0003XR-6O for emacs-orgmode@gnu.org; Thu, 20 Sep 2012 18:27:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TEpD5-0002v0-VE for emacs-orgmode@gnu.org; Thu, 20 Sep 2012 18:27:05 -0400 Received: from g4t0017.houston.hp.com ([15.201.24.20]:48153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEpD5-0002ut-Oo for emacs-orgmode@gnu.org; Thu, 20 Sep 2012 18:27:03 -0400 In-Reply-To: Message from Achim Gratz of "Thu, 20 Sep 2012 23:00:19 +0200." <87obl0xvdo.fsf@Rainer.invalid> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Achim Gratz Cc: emacs-orgmode@gnu.org Achim Gratz wrote: > Nick Dokos writes: > > Achim Gratz wrote: > > > >> Nick Dokos writes: > >> > This doesn't make sense (I blame the head-spinning reverts :-) ), so let > >> > me try again: Eric's commit broke it between 7.8.03 and 7.8.04. It got > >> > fixed somehow, either because of a revert or because some fix was > >> > actually applied, I don't know which. It was working until 7.8.10 and > >> > then Bastien's commit reverted to (broken) 7.8.04, so from 7.8.11- on > >> > the breakage exists. > >> > >> What are you talking about? I don't see any revert between 7.8.10 and > >> 7.8.11? You need to be careful with bisecting acroess fixups, you > >> should "skip" such commits (also commits that don't build, etc.). > >> > > > > I may be confused but what I'm talking about is tags on the master > > branch: commit 552b0edb254a104e441e28f3a942dc6005e97f87 came between the > > tags "release_7.8.10" and "release_7.8.11" on the master branch: > > That's a trap: the release tag for 7.8.11 is on the wrong side of the > merge and as a result you're pulling in the complete history of commits > that are in one branch, but not the other and that includes the botched > merge before 7.8.04. > > OK. Is there no way to fix that? That's pretty confusing. And how can I tell that I have fallen into this trap? Nick