In Mercurial, make some files same on all branches -


this might impossible or silly or bad practice or idea.

i have branch deployment scripts in repo , whenever update them (often) need merge branch other current feature branches these scripts in updated version. possible make files same no matter branch i'm on?

i have considered subrepositories they're discouraged

considered subrepositories they're discouraged

it's developers opinion, nothing more (and guestrepo better choice on path) - splitting separate repo natural way (and 1-st idea)

but if you'll prefer tricky way, can

  • change scripts in 1 (or more) changesets, not mixed other files
  • graft (hg graft) these changesets other branches, using -t "internal:other" additional option: in case changes source changesets win automatically in conflicts , appear in target. headache "one mandatory graft per branch"

Comments