[Bug 340726] Re: Daily autocommits lead to frequent conflicts

2009-12-14 Thread Thierry Carrez
Closing as Invalid, as nobody else has been able to reproduce that issue. If you can reproduce it, please reopen this bug. ** Changed in: etckeeper (Ubuntu) Status: Incomplete => Invalid -- Daily autocommits lead to frequent conflicts https://bugs.launchpad.net/bugs/340726 You received th

[Bug 340726] Re: Daily autocommits lead to frequent conflicts

2009-03-23 Thread Chris Conway
Thierry, I will try to reproduce the problem and let you know. Here's an example stack trace from .bzr.log: Fri 2009-02-27 09:49:54 -0500 0.018 bzr arguments: [u'commit', u'-m', u'saving uncommitted changes in /etc prior to apt run'] 0.026 looking for plugins in /home/chris/.bazaar/plugins 0.09

[Bug 340726] Re: Daily autocommits lead to frequent conflicts

2009-03-23 Thread Thierry Carrez
Hm, statuschange fumble. ** Changed in: etckeeper (Ubuntu) Status: Invalid => Incomplete -- 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. -- u

[Bug 340726] Re: Daily autocommits lead to frequent conflicts

2009-03-23 Thread Thierry Carrez
I fail to see how a standalone tree can return "bzr: ERROR: Working tree is out of date, please run 'bzr update'." Maybe a lurking bzr specialist could explain that to me :) If you remove the ignores, do the conflicts come back ? If you disable the daily autocommits, does the bug disappear ? ** C

[Bug 340726] Re: Daily autocommits lead to frequent conflicts

2009-03-22 Thread Chris Conway
~$ sudo bzr info /etc Standalone tree (format: pack-0.92) Location: branch root: /etc -- 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-bug

[Bug 340726] Re: Daily autocommits lead to frequent conflicts

2009-03-19 Thread Thierry Carrez
What does "sudo bzr info /etc" return ? ** Changed in: etckeeper (Ubuntu) Status: New => Incomplete -- 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 Ubu

[Bug 340726] Re: Daily autocommits lead to frequent conflicts

2009-03-19 Thread Thierry Carrez
** Changed in: etckeeper (Ubuntu) Status: Incomplete => 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

[Bug 340726] Re: Daily autocommits lead to frequent conflicts

2009-03-17 Thread Chris Conway
Thierry, You're right that the behavior doesn't really make sense. And I can't explain it. To have the /etc working tree "out of date" would imply that etckeeper somehow made a revision to the repository that didn't come from /etc. I'm not sure how that would happen. In particular, I'm not sure th

[Bug 340726] Re: Daily autocommits lead to frequent conflicts

2009-03-16 Thread Thierry Carrez
I'm not sure I get what the issue is... and how it relates to the daily autocommits feature. Yes, some files in /etc get updated by the system and that will appear in the etckeeper history. But how can the tree be out of date when you run a commit ? That supposes you originally checked it out from

[Bug 340726] Re: Daily autocommits lead to frequent conflicts

2009-03-13 Thread Chris Conway
It's not sufficient to put "resolvconf/run" and "cups/subscriptions.conf*" in .bzrignore. They must also be removed from the repo. I.e., from an up-to-date state: $ bzr rm --keep resolvconf/run cups/subscriptions.conf* $ bzr commit -m "Removing volatile files" $ bzr ignore resolvconf/run 'cu