best way to manage local code changes which shouldn't be propagated

[Peter Arrenbrecht]

2009/1/15 Georg <gwk.rko at googlemail.com>:
> Hi,
>
> I am looking for a usable way of managing local code changes which I don't
> want to share when pushing.
>
> The use case here is for local shortcuts, maybe temporary bug
> fixes/workarounds until the owner of the respective code module comes up
> with the proper fix, maybe disabling certain features not useful in a
> development environment (license checks ... :-)). These I want to apply only
> in my local environment, they should never be propagated.  Other code
> changes which I do (deliverable code) should be propagated.
>
> I am currently using mq for the local changes, but this is intrusive to my
> work flow.  Before committing deliverable code changes I have to qpop -af,
> then commit, then push, then qpush -a to reapply my local shortcuts.
>
> Isn't there a better way?

This might work for you too:

  http://www.nabble.com/Re%3A-simple-branch-problem-p21480279.html

-parren