I have an /etc
file tree which is managed by etckeeper
, based on Mercurial.
After running apt-get dist-upgrade
, I want to revision the changes which have been applied by the upgrade.
However, when doing
hg add $(hg status . --unknown --no-status)
I get this conflict:
abort: file 'php5/apache2/conf.d' in dirstate clashes with 'php5/apache2/conf.d/05-opcache.ini'
hg status php5/apache2/conf.d
gives me:
! php5/apache2/conf.d
? php5/apache2/conf.d/05-opcache.ini
? php5/apache2/conf.d/10-pdo.ini
? php5/apache2/conf.d/20-json.ini
? php5/apache2/conf.d/20-readline.ini
This looks contradictory to me: If the directory php5/apache2/conf.d
would be missing, how could it contain new (unversioned) files?!
How can I resolve this conflict?
(Debian Linux, upgraded 7.11 to 8.5; Mercurial 3.4.2)