Error while Merging

[Haszlakiewicz, Eric]

>-----Original Message-----
>From: mercurial-bounces at selenic.com
[mailto:mercurial-bounces at selenic.com]
>
>  12.08.2010 14:13, Petchimuthu wrote:
>>        I need those uncommitted changes. I will commit later. Is it
>possible?
>>
>>       If i didn't use the merge command then, I can able to push even
i
>have
>> an uncommitted changes in  my local
>>
>>       Then, why it throws error when i used merge ? can u explain it?
>
>You can you TortoiseHG Shelve command/dialog or shelve extension for hg
to
>shelve/unshelve uncommited changes. Your workflow is
>"Shelve - Merge - Commit - Unshelve".

Shelve doesn't seem to be part of the standard mercurial distribution,
so if you want a workflow that doesn't require installing additional
stuff you can create a temporary clone and do the merge there.  e.g.:

hg clone realdir tempdir
cd tempdir
hg merge
hg ci -m merge
hg push
cd ..
rm -rf tempdir
cd realdir
hg up

eric