Branches or Bookmarks

[Stephen Rasku]

I have a repository for my development environment.  Part of this is the
copyright template which is different for each company I work for.  I was
planning on creating a branch and any generic changes would go in the
default branch and the yearly copyright changes would go in the company
branch.  I would merge the generic changes to the company branches as they
were made.

However, when I created the branch it asked if I wanted to create a
bookmark instead.  Do I?  Would it make more sense?  The development
environment is on Bitbucket and I would like to avoid pushing proprietary
changes there if at all possible.  It seems it would be easy to do by
accident if I am on the proprietary branch all the time.

Thoughts?

...Stephen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20150819/474492d1/attachment.html>