On 22-09-2010 13:09:28 +0200, Niels Nes wrote:
> > % vim ... # make changes
> > % hg commit -m "my change"
> > % hg pull --rebase # get new changes, put already locally committed changes 
> > on top
> > % hg push
> so now with local uncommitted changes.

% hg qnew -m "temp stuff" temp.patch
% hg qpop # get stuff just put in a patch out of the way
% hg pull --rebase
% hg push
% hg qpush # reapply patch
% vim ... # keep on hacking
% hg qrefresh # update patch every once in a while
% hg qfinish temp.patch # finish the patch, commit it

You can also use plain diff and patch, of course.  Or use a secondary
clone to do quick things with.  Hg doesn't really like dirty working
repos, hence I just changed my ways to utilise a patch queue as above.
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to