emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Nick Dokos <nicholas.dokos@hp.com>
To: Bernt Hansen <bernt@norang.ca>
Cc: Nicolas Goaziou <n.goaziou@gmail.com>,
	nicholas.dokos@hp.com, Org-mode <emacs-orgmode@gnu.org>
Subject: Re: Links in tables and LaTeX export
Date: Tue, 05 Jul 2011 19:26:34 -0400	[thread overview]
Message-ID: <25027.1309908394@alphaville.americas.hpqcorp.net> (raw)
In-Reply-To: Message from Bernt Hansen <bernt@norang.ca> of "Tue, 05 Jul 2011 18:58:39 EDT." <87pqloxrkw.fsf@norang.ca>

Bernt Hansen <bernt@norang.ca> wrote:

> Nick Dokos <nicholas.dokos@hp.com> writes:
> > Thomas S. Dye <tsd@tsdye.com> wrote:
> >
> >> I can confirm that the formerly broken links in my tables work with
> >> Org-mode version 7.5 (release_7.5.596.gea215).
> >> 
> >
> > I'm puzzled (and a bit worried about the integrity of my tree): I pulled
> > a short while ago and ''git describe HEAD'' says:
> >
> >       baseline-490-gde0fcdf
> >
> > so it seems I have an extra tag between release_7.5 and HEAD and
> > although I have no idea where it came from, it does not seem to be much
> > of a problem[fn:1], since I can get things relative to release_7.5:
> >
> >       $ git describe --long  --match release_7.5 HEAD
> >       release_7.5-579-gde0fcdf
> >
> > But why do I have 579 commits since then and you have 596 (and the HEADs
> > have different SHA1s)? Are you applying local mods? That would explain
> > the discrepancy in the commit count, as well as the discrepancy in the
> > SHA1, but if so, why isn't your version marked ``dirty''?
> >
> > Just trying to understand,
> Hi Nick,
> The tree is only marked 'dirty' if you have uncommitted changes in your
> working tree.  If other commits were merged in with master in their
> repository (ie. they made local commits and then did git pull which is
> fetch + merge on top of their local commits they'll have their commits
> in the history and it will change all of the subsequent SHA1s)

Ah, OK: for some reason, I thought "dirty" meant "not pristine" (and I guess
it does in some sense, but not here :-) ).

> I have the same tree as you - my current origin/master is 
> bernt@gollum:~/git/org-mode$ git describe origin/master
> release_7.5-580-g301b345
> bernt@gollum:~/git/org-mode$ git describe origin/master^
> release_7.5-579-gde0fcdf
> and one commit before my current head is the same SHA1 that you have.
> So... your repository is good. :)


> git describe will use the closest tag (in your case 'baseline'.  You
> can just remove the baseline tag from your repository if you don't want
> it.  If it's an exported tag in a repository you fetch from it will be
> recreated on a future fetch.  Maybe it came from some repository other
> than origin?

Maybe - or maybe I created it and I don't remember (so what's new?).
I guess I'll play whack-a-mole with it and see.

From what I gather, Tom is getting additional merge commits every time
he pulls (which accounts for the extras and the different SHA1). I think
I used to have that problem, but I don't any more, and I don't remember
(so what's new?)  how it came about and/or I resolved it. Any ideas
about that? I may have just deleted the master branch and recreated it.

Thanks for checking and thanks for the pointers,

  reply	other threads:[~2011-07-05 23:26 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-05  1:58 Links in tables and LaTeX export Thomas S. Dye
2011-07-05  3:10 ` Nick Dokos
2011-07-05 10:07   ` Bastien
2011-07-05 10:10     ` Nicolas Goaziou
2011-07-05 12:03 ` Nicolas Goaziou
2011-07-05 15:06   ` Nick Dokos
2011-07-05 15:18   ` Thomas S. Dye
2011-07-05 17:03     ` Nick Dokos
2011-07-05 22:58       ` Bernt Hansen
2011-07-05 23:26         ` Nick Dokos [this message]
2011-07-05 23:36           ` Bernt Hansen
2011-07-05 23:46             ` Nick Dokos
2011-07-06  0:26               ` Thomas S. Dye

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:

  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=25027.1309908394@alphaville.americas.hpqcorp.net \
    --to=nicholas.dokos@hp.com \
    --cc=bernt@norang.ca \
    --cc=emacs-orgmode@gnu.org \
    --cc=n.goaziou@gmail.com \


* 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


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).