dhis2-devs team mailing list archive

[Bob Jolliffe <bobjolliffe@xxxxxxxxx>]

No that doesn't work either ... I'm getting the similar weird conflict messages:

Conflict: can't delete dhis-2/dhis-services/dhis-service-xml because
it is not empty.  Not deleting.
Conflict because dhis-2/dhis-services/dhis-service-xml is not
versioned, but has versioned children.  Versioned directory.
.. etc

The whole business seems similar to what is happening here :
https://bugs.launchpad.net/bzr/+bug/477475



2010/2/18 Bob Jolliffe <bobjolliffe@xxxxxxxxx>:
> 2010/2/18 Lars Helge Øverland <larshelge@xxxxxxxxx>:
>>
>> No need to check out trunk... Just do
>> bzr merge lp:dhis2
>
> Yes I have been doing this all along.  To keep my branch synched with
> trunk.  But now I really want to go the other way ...
>
> I guess the easiest will be to do this and then push to trunk?
>
> Bob
>
>>
>> On Thu, Feb 18, 2010 at 1:50 PM, Bob Jolliffe <bobjolliffe@xxxxxxxxx> wrote:
>>>
>>> I am having something of a problem with 'bzr merge'.  I checkout from
>>> trunk into say dhis2-trunk/ .
>>>
>>> Then I try bzr merge ../dhis2-xml to merge my changes but I keep
>>> getting conflicts along the lines of
>>>
>>> Conflict adding files to dhis-2/dhis-services/dhis-service-xml.
>>> Created directory.
>>> Conflict because dhis-2/dhis-services/dhis-service-xml is not
>>> versioned, but has versioned children.  Versioned directory.
>>> Conflict adding file dhis-2/dhis-services/dhis-service-xml.  Moved
>>> existing file to dhis-2/dhis-services/dhis-service-xml.moved.
>>>
>>> Any idea how to resolve these?
>>>
>>> Regards
>>> Bob
>>>
>>> _______________________________________________
>>> Mailing list: https://launchpad.net/~dhis2-devs
>>> Post to     : dhis2-devs@xxxxxxxxxxxxxxxxxxx
>>> Unsubscribe : https://launchpad.net/~dhis2-devs
>>> More help   : https://help.launchpad.net/ListHelp
>>
>>
>