Need advice how to keep local changes without committing tomain branch

[Andrei Vermel]

----- Original Message ----- 
From: "Brendan Cully" <brendan at kublai.com>
To: "Andrei Vermel" <avermel at mail.ru>
Cc: <mercurial at selenic.com>
Sent: Wednesday, December 13, 2006 7:36 PM
Subject: Re: Need advice how to keep local changes without committing tomain branch


> On Wednesday, 13 December 2006 at 00:18, Andrei Vermel wrote:
>> I need to regularly commit changes to the main branch, but there are some 
>> local changes that I do not want to commit. Also I'd like to be able to 
>> resolve conflicts if the locally changed files get changed in the main 
>> branch.
>> MQ doesn't help as far as I can tell, as with patches applied I can't 
>> commit easily - would need to qpop / qpush all the time. I can't add the 
>> files to the .hgignore either, since they are managed by hg.
>> 
>> Can anyone recommend how to do it properly please?
> 
> mq's guards are suited to this. Tag your local changes with -upstream,
> and qselect --reapply upstream when you want a tree without those.
>

This works very nicely, but there's one concern left. After I do:
qselect --reapply upstream 
commit/update/whatever
qselect --reapply -n

the files with local changes get a new timestamp which causes a massive rebuild 
as the changes are in project configuration files.

Do you think it would be possible to somehow either optionally restore timestamp
of patched files, or allow commit/update of files that do not include the patched
files?

Best regards,

Andrei