mercurial 1.4 and pbranch problem

Peter Arrenbrecht peter.arrenbrecht at gmail.com
Thu Nov 19 03:05:52 CST 2009


On Thu, Nov 19, 2009 at 9:10 AM, Christoph Egger <Christoph_Egger at gmx.de> wrote:
> I upgraded from mercurial 1.3.1 to mercurial 1.4.
>
> 'hg pgraph' stopped working:
>
>  File "pbranch.py", line 855, in cmdprintgraph
>    graphlog.ascii(ui, grapher)
> TypeError: ascii() takes exactly 6 arguments (2 given)

Please try with the "crew" branch of pbranch:

http://www.bitbucket.org/parren/hg-pbranch/raw/crew/hgext/pbranch.py

And please note that hg 1.4 introduces a new, as yet unsolved problem
for pmerge:

http://bitbucket.org/parren/hg-pbranch/issue/37/need-to-resolve-same-conflict-repeatedly#comment-76146

-parren


More information about the Mercurial mailing list