comparison contrib/mergetools.hgrc @ 20176:4c96c50ef937

subrepo: check phase of state in each subrepositories before committing Before this patch, phase of newly created commit is determined by "phases.new-commit" configuration regardless of phase of state in each subrepositories. For example, this may cause the "public" revision in the parent repository referring the "secret" one in subrepository. This patch checks phase of state in each subrepositories before committing in the parent, and aborts or changes phase of newly created commit if subrepositories have more restricted phase than the parent. This patch uses "follow" as default value of "phases.checksubrepos" configuration, because it can keep consistency between phases of the parent and subrepositories without breaking existing tool chains.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Wed, 13 Nov 2013 15:55:30 +0900
parents 3de9b1f9ebc3
children 12c7cea6235c
comparison
equal deleted inserted replaced
20175:5ff0fd023850 20176:4c96c50ef937