Using mercurial while keeping uncomitted changes

[waldemar]

On 04/09/2010 10:52 AM, Dirkjan Ochtman wrote:
> On Fri, Apr 9, 2010 at 19:03, Aardwolf <toiletpot at gmail.com> wrote:
>   
>> How can I get the "wanted" situation in the image without having to commit
>> my uncommitted local changes, or in the least painful way?
>>     
> Pull before you commit twelve. Commit twelve by specifying files with
> commit or using the record extension. Then push.
>   
There are other ways, too.  I like to branch with any projects that are
not to be pushed immediately.  I've used both internal branches and
clones.  In your case, you can clone your repo with 12 already
checked-in, then merge and push.  Or, you can rebase and push which
would produce 10-11-12 exactly like in the picture.  You can get all
that back into your local clone branch and merge your work eventually
when the time comes. 

You can also create an internal branch for your WD stuff which you would
never push.  This would work like above but perhaps would be more handy
in certain situations.

Then there is shelve extension but I have not used it.

> Cheers,
>
> Dirkjan
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>