Re: extra head

[Daniel J Sebald]

On 08/16/2013 01:12 PM, Ben Abbott wrote:
> On Aug 16, 2013, at 1:59 PM, Daniel J Sebald wrote:
>
> > On 08/16/2013 12:44 PM, Ben Abbott wrote:
> > > On Aug 16, 2013, at 1:22 PM, Daniel J Sebald wrote:
> > [snip]
> > > > http://hg.savannah.gnu.org/hgweb/octave/
> > > >
> > > > that John D's latest push now has an @ symbol attached. I don't recall
> > > > seeing "default tip @" in the past. Did Rik's merge perhaps bookmark
> > > > the tip? Bookmarking the tip doesn't make sense, does it?
> > >
> > > I can't claim to be an expert in mercurial, but ... I've been seeing the
> > > "default tip @" since I started using bookmarks. For example, see my "hg
> > > id", "hg tip", and "hg log" below.
> > >
> > > $ hg id
> > > 2ab5636ee75f+ tip @
> > >
> > > $ hg tip
> > > changeset: 17263:2ab5636ee75f
> > > bookmark: @
> > > tag: tip
> > > user: Ben Abbott<address@hidden<mailto:address@hidden>>
> > > date: Fri Aug 16 13:00:46 2013 -0400
> > > summary: * scripts/plot/hold.m: Fix typo "vargin" ->  "varargin".
> > >
> > > $ hg log | less
> > >
> > > changeset: 17263:2ab5636ee75f
> > > bookmark: @
> > > tag: tip
> > > user: Ben Abbott<address@hidden<mailto:address@hidden>>
> > > date: Fri Aug 16 13:00:46 2013 -0400
> > > summary: * scripts/plot/hold.m: Fix typo "vargin" ->  "varargin".
> > >
> > > <snip>
> > >
> > > and a snippet from "hg view" (which is what I prefer to look at as it
> > > provides more info).
> > >
> > >
> > > Does any of this look unusual? I'm running mercurial version 2.6.3.
> >
> > OK.  To me the bookmark looks unusual, but my version of mercurial is quite a 
> > bit older than yours.  That's probably why.
> >
> > Dan
>
> Maybe there is some problem between your version and mine? (the multiple heads 
> split from your last push)
>
>         http://hg.savannah.gnu.org/hgweb/octave/graph/2ab5636ee75f

Yes, I noticed that.  This is why I'm giving it a little more attention. 
 I only created the exported changeset patch, no push.  Torsten pushed 
that around 2 pm on Thursday (8/15).  Your push was around 7 pm on 
Thursday.  If I'm understanding correctly from your script, you pulled 
that version, then made changes, then pushed.  If it were a changeset 
from, say, a day previous the branch would be elsewhere.  So it seems 
something unusual happened with your, my or Torsten's process.


> What version are you running?

Version 1.8.4.

Here is the only content (beyond the diff hunks) in the changeset I 
created that Torsten pushed:

# HG changeset patch
# User Daniel J Sebald <address@hidden>
# Date 1375924684 18000
# Node ID a7918008c7e5c85654ca241285a87230df1b831d
# Parent  1c2f14a7935d8237db1f85fabe4152a3f1bfa32b
Adjust history window copy/evaluate and remove carriage returns (bug #39722)

[snip]

diff --git a/libgui/src/history-dock-widget.cc 
b/libgui/src/history-dock-widget.cc
--- a/libgui/src/history-dock-widget.cc
+++ b/libgui/src/history-dock-widget.cc

[snip]

exporting patch:
<fdopen>

Dan