[Dhis2-devs] bzr merge problem

2010-02-18 Thread Bob Jolliffe
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

Re: [Dhis2-devs] bzr merge problem

2010-02-18 Thread Lars Helge Øverland
No need to check out trunk... Just do bzr merge lp:dhis2 On Thu, Feb 18, 2010 at 1:50 PM, Bob Jolliffe bobjolli...@gmail.com 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

Re: [Dhis2-devs] bzr merge problem

2010-02-18 Thread Bob Jolliffe
2010/2/18 Lars Helge Øverland larshe...@gmail.com: 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

Re: [Dhis2-devs] bzr merge problem

2010-02-18 Thread Bob Jolliffe
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