[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: two stable heads
From: |
Jordi Gutiérrez Hermoso |
Subject: |
Re: two stable heads |
Date: |
Tue, 12 Apr 2011 20:54:33 -0500 |
On 12 April 2011 20:43, Ben Abbott <address@hidden> wrote:
> I see two stable heads ...
>
> $ hg heads
> changeset: 12598:b1913cd27f76
> branch: stable
> tag: tip
> user: Ben Abbott <address@hidden>
> date: Tue Apr 12 20:07:15 2011 -0400
> summary: data.txi: Replace xref{Data Structures} with xref{Structures}.
>
> changeset: 12594:a3a7da1489b2
> branch: stable
> parent: 12591:4727fd4dd4bb
> user: Rik <address@hidden>
> date: Mon Apr 11 19:03:32 2011 -0700
> summary: Modify func.txi discussion of output arguments to include
> discussion of isargout.
>
> changeset: 12589:890af1cf0a86
> user: Rik <address@hidden>
> date: Mon Apr 11 11:33:08 2011 -0700
> summary: Remove deprecated and private functions from list of functions
> requiring tests.
>
> As I expect this to be come a common occurrence, I thought I should ask ...
> How is this fixed?
It shouldn't be a common occurrence, but it's no big deal if it
happens. "hg up -r $one_of_the-stable_heads && hg merge -r
$the_other_stable_head" is how you handle it. Most of the time, it'll
be a trivial merge. I earlier undid one such head.
I notice that it was Rik who created an extra stable head each time.
How odd. Rik, you're not pushing with -f, are you? hg should warn if
you're creating new remote heads.
- Jordi G. H.
- two stable heads, Ben Abbott, 2011/04/12
- Re: two stable heads,
Jordi Gutiérrez Hermoso <=