Public bug reported:
Binary package hint: etckeeper
I'm running 0.30ubuntu2, backported to Intrepid via prevu. With daily
auto-commits enabled, I get conflicts in cups/subscriptions.conf and
resolvconf/run/interface/NetworkManager almost every time I try to
commit. When I try to run apt, I get the error:
bzr: ERROR: Working tree is out of date, please run 'bzr update'.
The conflicts in cups/subscriptions.conf look like:
<<<<<<< TREE
# Subscription configuration file for CUPS v1.3.9
# Written by cupsd on 2009-03-09 16:12
NextSubscriptionId 25
<Subscription 24>
Events printer-state-changed printer-restarted printer-shutdown printer-stopped
printer-added printer-deleted job-state-changed job-created job-completed
job-stopped job-progress
Owner chris
LeaseDuration 86400
Interval 0
ExpirationTime 1236715942
NextEventId 32
</Subscription>
=======
# Subscription configuration file for CUPS v1.3.9
# Written by cupsd on 2009-03-07 09:47
NextSubscriptionId 24
>>>>>>> MERGE-SOURCE
Setting .bzrignore for these files seems to help, but they really should
be ignored automatically.
** Affects: etckeeper (Ubuntu)
Importance: Undecided
Status: New
--
Daily autocommits lead to frequent conflicts
https://bugs.launchpad.net/bugs/340726
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
