dhis2-devs-core team mailing list archive

[Bob Jolliffe <bobjolliffe@xxxxxxxxx>]

FWIW I discovered the neatest way to resolve these "Directory not
empty .. not deleting" conflicts seems to be to run bzr resolve like:

bzr resolve --action=take-other dhis-services/dhis-service-tracker

This (pretty non-intuitive) command issues a bzr rm on the directory
and then marks the conflict as resolved.

On 23 June 2015 at 17:03, Lars Helge Øverland <larshelge@xxxxxxxxx> wrote:
> Hi,
>
> I have merged the dhis-service-tracker and dhis-service-sms project into
> dhis-service-core.
>
> We are in increasingly need of having associations between the core domain
> objects and the tracker objects as tracker becomes more integral to core.
> E.g. we need an association between program and user role, and for the 2.20
> feature for allowing program attributes and indicators in pivot tables,
> charts and later maps we need to associate report tables with program
> indicators etc.
>
> Tracker had dependencies on sms project (not so good) and I had to merge
> that too into core.
>
> You must remove the dhis-service-tracker project from your IDE manually, and
> do a full clean and build.
>
> Lars
>
>
> --
> Mailing list: https://launchpad.net/~dhis2-devs-core
> Post to     : dhis2-devs-core@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~dhis2-devs-core
> More help   : https://help.launchpad.net/ListHelp
>