From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: Invalid function: with-parsed-tramp-file-name with Perl Date: Fri, 21 Sep 2012 19:49:17 +0200 Message-ID: <87a9wjs1uq.fsf@Rainer.invalid> References: <87hau4ubgp.fsf@slate.zedat.fu-berlin.de> <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> <18599.1348180015@alphaville> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([208.118.235.92]:58984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF7M6-0001Mb-L9 for emacs-orgmode@gnu.org; Fri, 21 Sep 2012 13:49:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF7M5-0007fy-Be for emacs-orgmode@gnu.org; Fri, 21 Sep 2012 13:49:34 -0400 Received: from plane.gmane.org ([80.91.229.3]:58332) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF7M5-0007ft-52 for emacs-orgmode@gnu.org; Fri, 21 Sep 2012 13:49:33 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1TF7M6-0003dW-52 for emacs-orgmode@gnu.org; Fri, 21 Sep 2012 19:49:34 +0200 Received: from pd9eb5e4c.dip.t-dialin.net ([217.235.94.76]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 21 Sep 2012 19:49:34 +0200 Received: from Stromeko by pd9eb5e4c.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 21 Sep 2012 19:49:34 +0200 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: emacs-orgmode@gnu.org Nick Dokos writes: > OK. Is there no way to fix that? That's pretty confusing. If you already know the tag is on a merge commit on the wrong side: git tag fixup release_7.8.11 git tag -d release_7.8.11 git tag release_7.8.11 fixup^2 git tag -d fixup > And how can I tell that I have fallen into this trap? Probably easiest to see in gitk. Otherwise, git --no-pager show release_7.8.11 tells you you are dealing with a merge and what the two parents are. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Factory and User Sound Singles for Waldorf Q+, Q and microQ: http://Synth.Stromeko.net/Downloads.html#WaldorfSounds