hg branches -a incorrect in mercurial 3.1.1

[Mariska Hoogenboom]

Hi,

I still have this issue with Mercurial 3.2.3 and TeamCity 8.1. A solution could be to disable "Use uncompressed transfer", but we have many repositories and this is a 'per repository setting', so would be a lot of work. Therefore I've downgrade mercurial to 2.8.1 on the TeamCity server again.

Met vriendelijke groet/Kind regards,

Mariska Hoogenboom

-----Original Message-----
From: Mercurial [mailto:mercurial-bounces at selenic.com] On Behalf Of Mariska Hoogenboom
Sent: Tuesday, December 23, 2014 9:12 AM
To: 'Matt Mackall'
Cc: Mercurial at selenic.com; 'Augie Fackler'
Subject: RE: hg branches -a incorrect in mercurial 3.1.1

Ok, thanks. I'll give 3.2 a try. 

Met vriendelijke groet/Kind regards,

Mariska Hoogenboom

-----Original Message-----
From: Matt Mackall [mailto:mpm at selenic.com]
Sent: Monday, December 22, 2014 7:47 PM
To: Mariska Hoogenboom
Cc: 'Augie Fackler'; Mercurial at selenic.com
Subject: Re: hg branches -a incorrect in mercurial 3.1.1

On Mon, 2014-12-22 at 09:39 +0000, Mariska Hoogenboom wrote:
> Hi,
> 
> With mercurial 3.2.3 I also don't see the correct active branches if 
> the repository is cloned with mercurial 3.1.1 from TeamCity with the 
> unix line endings.  I currently can't test what will happen if I clone 
> the repository from TeamCity with mercurial 3.2.3.

I think this is a known bug fixed in 3.2:

----
changeset:   25096:8b4a8a9176e2
branch:      stable
parent:      25093:a5d6a609752b
user:        Matt Mackall <mpm at selenic.com>
date:        Sat Nov 01 17:30:57 2014 -0500
files:       mercurial/localrepo.py tests/test-ssh.t
description:
clone: properly mark branches closed with --uncompressed (issue4428)

On streaming clone, we were priming the local branch cache with the remote branchmap, without checking which heads were closed.

This fixes an issue introduced in:

 changeset:   17740:e6067bec18da
 user:        Tomasz Kleczek <tomasz.kleczek at fb.com>
 date:        Wed Oct 03 13:19:53 2012 -0700
 summary:     branchcache: fetch source branchcache during clone
(issue3378)

that was exposed in 2.9 by:

 changeset:   20192:38fad5e76ee8
 user:        Brodie Rao <brodie at sf.io>
 date:        Mon Sep 16 01:08:29 2013 -0700
 summary:     branches: simplify with repo.branchmap().iterbranches()
----

You can fix the bug by deleting your cache files.

FYI, the concept of active/inactive branches (the -a switch) has been deprecated approximately forever:

    Branch, inactive
        If a named branch has no topological heads, it is considered to be
        inactive. As an example, a feature branch becomes inactive when it is
        merged into the default branch. The "hg branches" command shows
        inactive branches by default, though they can be hidden with "hg
        branches --active".

        NOTE: this concept is deprecated because it is too implicit. Branches
        should now be explicitly closed using "hg commit --close-branch" when
        they are no longer needed.

..and it's an oversight that it's even mentioned by the help still. I'll fix that now.

--
Mathematics is the supreme nostalgia of our time.


_______________________________________________
Mercurial mailing list
Mercurial at selenic.com
http://selenic.com/mailman/listinfo/mercurial