mercurial package in 10.04.4 is broken

[Gene Heskett]

Greetings;

I help maintain a software repo for a nearly 30 year old computer, a repo 
that was about 10 months ago switched from CVS to Mercurial. I have been 
informed that I just undid some fairly important work by another 
contributor this morning when I did a push of some of my work.

This is because when I do an hg pull, I get this at the end:
gene at coyote:/opt/nitros9$ hg pull
Password: 
pulling from 
ssh://gheskett@nitros9.hg.sourceforge.net/hgroot/nitros9/nitros9
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 3 files
(run 'hg update' to get a working copy)
remote: Running preoutgoing hook
remote: Use of uninitialized value in concatenation (.) or string at 
/etc/mercurial/preoutgoing line 36.
gene at coyote:/opt/nitros9$ hg update
abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to 
discard changes)
gene at coyote:/opt/nitros9$ hg merge
abort: outstanding uncommitted changes (use 'hg status' to list changes)

Obviously the update failed.  Or it really isn't the next command to use to 
install the pulled changes into my copy.

So, how am I to resolve this while staying within the confines of the hg 
manager?

Thanks all.


Cheers, Gene
-- 
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
My web page: <http://coyoteden.dyndns-free.com:85/gene> is up!
Support the Girl Scouts!
	(Today's Brownie is tomorrow's Cookie!)
I was taught to respect my elders, but its getting 
harder and harder to find any...