Best way to keep proprietary changes local
Stephen Rasku
mercurial at srasku.net
Fri Nov 16 21:15:49 UTC 2012
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.
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.
...Stephen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20121116/3fb83422/attachment-0002.html>
More information about the Mercurial
mailing list