Best way to keep proprietary changes local

[Pierre-Yves David]

On Fri, Nov 16, 2012 at 01:15:49PM -0800, Stephen Rasku wrote:
> What is the best way to keep proprietary changes local.  I have a
> development environment that I have on bitbucket.  I have to make local
> changes for the company I am working for and I don't want to push those
> changes.

You can put your local only commit in the "secret" phase 

see http://mercurial.selenic.com/wiki/Phases
and http://www.logilab.org/blogentry/88203


> What I planned to do was to create a local anonymous branch with the local
> changes and merge the generic changes in periodically.  I just realized
> that if I merge I won't have multiple heads and it will happily push the
> merged code without warning.  I can avoid this if I specify the revision
> before the merge but I want something more automatic.  The local changes
> are trivial so I don't really want a heavyweight solution.
> 
> I suppose I could have a separate clone where I run the environment and
> merge the local changes and another one where I make my generic changes.
>  Another option is to use mq and pop my local changes before I push to
> bitbucket.  Any ideas?  I would like it to be as automatic as possible.

Using a distinct clone would help too

-- 
Pierre-Yves David

http://www.logilab.fr/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20121119/8d0a5673/attachment.asc>