[oe] Reconsidering the work flow and how the SCM system fits in

[Holger Freyther]

On Tuesday 11 March 2008 09:05:45 Koen Kooi wrote:
> Holger Freyther schreef:
> | PS: It is not the speed of mtn, it is the lack of development in areas
>
> like
>
> | branches, merging, rebasing, we need to use these in OE!
>
> How many people have actually used a branch when developing OE stuff? I
> did for the avr32 work and didn't have any problem, merging back only
> took one 'mtn propagate' and a push. Regardless if we should switch or
> not, I would like to see some 'evidence' of people trying to use a
> branch and fail.

I have been trying to merge the dreambox branch for the last six month. 
Monotone has not allowed me to do this so far. It has gone from just refusing 
the work, to spitting random ids on the console, to spitting filenames 
without path on the console. And no: Deleting/Renaming files before being 
able to merge is not an option, specially because mtn is not showing you all 
conflicts... so in the worse case you need to rename more than one file, 
creating really ugly history and only because mtn is not up to the job.
Also you have witnessed the issue with suspending branches and the automerger 
making them live again... there is enough evidence...

z.