branching graph
Jonathan Lundell
The clip below is from a recent pull from the web2py Google Code repository. I'm wondering why I'm seeing a branch.
Usually when I pull from the same place, I see no branch. When I do, it may last for another pull or two, but eventually the branch disappears.
> web2py-hg $ hg summary
> parent: 372:f327e0c71667 tip
> fixed more typos, thanks Jonathan
> branch: default
> commit: 2 modified, 3 unknown
> update: (current)
If I interpret that correctly, it's saying that the local parent is 372, but the graph shows 371.
There are no branches (in the sense that hg branch doesn't report any by default). The only tag is tip.
So why the branch in the graph?
Jens Alfke
Murky be slightly confused like this after it does a pull, but it
clears up next time it opens the repo from scratch.
If this does persist: what result do you get from the command "hg
parents"?
—Jens
Jonathan Lundell
> Does this persist if you close and reopen the repo window? I've seen Murky be slightly confused like this after it does a pull, but it clears up next time it opens the repo from scratch.
>
> If this does persist: what result do you get from the command "hg parents"?
web2py-hg $ hg parents
changeset: 372:f327e0c71667
tag: tip
user: mdip...@massimo-di-pierros-macbook.local
date: Tue Apr 06 04:50:15 2010 -0500
summary: fixed more typos, thanks Jonathan
You're right, though, it did not persist past a restart of Murky (not sure about window close+open; I had already quit in the meantime).
Jens Alfke
On Apr 6, 2010, at 2:06 PM, Jonathan Lundell wrote:
> You're right, though, it did not persist past a restart of Murky
> (not sure about window close+open; I had already quit in the
> meantime).
Then this is the same bug I've seen before. It's some kind of mistake
in my HgRepository class when it incrementally incorporates changes
from the repo. I don't think I've actually filed this in the bug
tracker, though.
—Jens