From: Nick Dokos <nicholas.dokos@hp.com>
To: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-orgmode@gnu.org
Subject: Re: Invalid function: with-parsed-tramp-file-name with Perl
Date: Thu, 20 Sep 2012 18:26:55 -0400 [thread overview]
Message-ID: <18599.1348180015@alphaville> (raw)
In-Reply-To: Message from Achim Gratz <Stromeko@nexgo.de> of "Thu, 20 Sep 2012 23:00:19 +0200." <87obl0xvdo.fsf@Rainer.invalid>
Achim Gratz <Stromeko@nexgo.de> wrote:
> Nick Dokos writes:
> > Achim Gratz <Stromeko@nexgo.de> 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
next prev parent reply other threads:[~2012-09-20 22:27 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-21 11:54 Invalid function: with-parsed-tramp-file-name with Perl Loris Bennett
2012-06-21 13:53 ` Nick Dokos
2012-06-21 14:51 ` Loris Bennett
2012-06-21 15:13 ` Nick Dokos
2012-06-25 7:05 ` Loris Bennett
2012-09-18 14:04 ` Loris Bennett
2012-09-19 7:45 ` Bastien
2012-09-19 9:28 ` Loris Bennett
2012-09-19 9:59 ` Bastien
2012-09-19 10:29 ` Loris Bennett
2012-09-19 13:49 ` Nick Dokos
2012-09-19 18:52 ` Achim Gratz
2012-09-19 19:51 ` Nick Dokos
2012-09-20 14:12 ` Loris Bennett
2012-09-20 15:11 ` Nick Dokos
2012-09-20 15:30 ` Nick Dokos
2012-09-20 17:21 ` Nick Dokos
2012-09-20 17:36 ` Nick Dokos
2012-09-20 18:29 ` Eric Schulte
2012-09-20 19:18 ` Achim Gratz
2012-09-20 20:51 ` Nick Dokos
2012-09-20 21:00 ` Achim Gratz
2012-09-20 22:26 ` Nick Dokos [this message]
2012-09-21 17:49 ` Achim Gratz
-- strict thread matches above, loose matches on Subject: below --
2012-09-22 5:05 Nick Dokos
2012-09-22 6:41 ` Achim Gratz
2012-09-22 6:57 ` Bastien
2012-09-22 7:03 ` Achim Gratz
2012-09-22 8:19 ` Bastien
2012-09-22 11:57 ` Achim Gratz
2012-09-22 16:14 ` Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=18599.1348180015@alphaville \
--to=nicholas.dokos@hp.com \
--cc=Stromeko@nexgo.de \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).