zeitgeist team mailing list archive

Thread
Date

Re: [Merge] lp:~ev/activity-log-manager/split-out-diagnostics-service into lp:activity-log-manager

To: Evan Dandrea <evan.dandrea@xxxxxxxxxxxxx>
From: Manish Sinha (मनीष सिन्हा) <me@xxxxxxxxxxxxxxx>
Date: Sat, 20 Jul 2013 05:02:25 -0000
In-reply-to: <20130719123724.1592.42847.launchpad@ackee.canonical.com>
Reply-to: mp+175820@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Needs Fixing merge-conflict, distcheck

First, it give a conflict that it cannot delete directory src/diagnostic

Second, even after I manually delete the folder and resolve conflict, distcheck fails because 2 files in po/POTFILES.in still reference the older ui file and C file in diagnostic folder

Please take care of these two issues and make sure that it still works as you expected it to work
-- 
https://code.launchpad.net/~ev/activity-log-manager/split-out-diagnostics-service/+merge/175820
Your team Activity Log Manager is subscribed to branch lp:activity-log-manager.

References

[Merge] lp:~ev/activity-log-manager/split-out-diagnostics-service into lp:activity-log-manager
From: Evan Dandrea, 2013-07-19