Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Excluding project configuration files from commits in Mercurial

Tags:

mercurial

I have a project that requires some configuration files. I want to keep the default configuration filse in the repository. However, I want don't want to have to specify the -X flag for every commit I do. Is there a standard way to mark a set of revisioned files as permanently excluded from commits?

like image 594
Tac-Tics Avatar asked Mar 04 '10 00:03

Tac-Tics


2 Answers

Interesting question, I hope you get a better answer. Faced similar problems, I have done the following:

  • Rename the configuration files, so that for example, instead of noweb.cfg I have noweb.cfg.default. This file changes seldom and is kept under revision control.

  • The actual configuration file, noweb.cfg, may change frequently but is put in the .hgignore file so it is never committed.

  • At need I have a special Makefile target that rebuilds *.cfg from *.cfg.default.

This solution is not ideal because changes in the .cfg files are lost when the .cfg.default changes. In principle you could tackle this issue with diff3 or some more sophisticated merge tool, but I have never been energetic enough to go there.

like image 190
Norman Ramsey Avatar answered Oct 10 '22 03:10

Norman Ramsey


You could use the (much maligned) defaults section in your .hgrc:

  [defaults]
  commit = -X thefileyouwanttoexclude

If you can retrain your fingers the preferred way to do that is with an alias instead:

 [alias]
  cmt = commit -X thefileyouwanttoexclude

then you start using hg cmt instead of commit.

like image 38
Ry4an Brase Avatar answered Oct 10 '22 03:10

Ry4an Brase