On Dec 19, 2009, at 12:10 AM, Hans Bakker wrote: > On Sat, 2009-12-19 at 10:23 +1300, Scott Gray wrote: >> The frustrating thing from >> my point of view is that this was discussed and the code of concern >> was subsequently removed from the branch but then added back in when >> BIRT came into the trunk. > > I used the svn merge command to move thinks into the trunk. It seems > that the merge command does ignore 'deleted' files and still adds them. > > Let me know where this merge went wrong and we will correct it.
Isn't it clear from the previous messages of this thread? Jacopo > > My Intention was to merge the 'addbirt' branch into he trunk at the > agreed status at the end. > > Regards, > Hans >
