mercurial package in 10.04.4 is broken

[Steve Flynn]

On 10 December 2012 23:40, Gene Heskett <gheskett at wdtv.com> wrote:

>> This is a problem on the remote configuration at sourceforge,
>> apparently triggered when the sf repo is ahead of your local repo.
>> Should you not have performed a pull at this point to bring your repo
>> up to date with remote and then merged your changes?
>
> hg merge syntax?  A plain, no arguments merge also fails.

/Shrug

Not clued up on hg enough to know the subtleties of their merging
strategy - I only run it locally at work to give me a little version
control on a repo only I update, so I never get into having to merge
my changes with anyone elses. However, if the preoutgoinghook on the
remote repo doesn't complete cleanly, as it didn't in this case, you
can't be sure that your version of the repo is in sync with the
sourceforge repo and thus all bets are off when it comes to merging
from that point on.

I'm tying myself in knots here, trying to remember how hg does things
versus git, which I'm much more au fair with. I'll reply again
tomorrow when I'm at work and can leaf through the hg manual at my
leisure.

> I looked at that 'remote' in the message and wondered if it was actually a
> sourceforge problem rather than mine.  Since all of my stuff has now been
> pushed, I wonder if its just as easy to nuke the tree and do a new hg
> clone?

I'm reasonably confident that it is indeed a sourceforge issue rather
than something on your local machine, and given that, moving your repo
to one side and running a fresh pull shouldn't hurt, as you should
merely be grabbing the latest version of all files. Then again, a
simply hg pull should leave you in precisely the same situation.

It's not just you by the way:
http://sourceforge.net/apps/trac/sourceforge/ticket/24321 and a few
other tickets all have the same issue, and there doesn't appear to be
moch happening with it other than moorman removing tags a few months
ago.

-- 
Steve

When one person suffers from a delusion it is insanity. When many
people suffer from a delusion it is called religion.