attempted merge

[Sean Wheller]

On Thursday 27 October 2005 19:03, Matthew East wrote:
> On Thu, 2005-10-27 at 18:48 +0200, Sean Wheller wrote:
> > What happened to using the svn merge command?
>
> I binned that, because as you know very well, it didn't work. I followed
> Jeff's advice on copying and pasting.
>
> If there is a specific problem with what I've done, please identify it
> and that way, we can fix it.

I have not had time to look, but I hope any changes made to trunk, while the 
branch was going on, were not removed.

In general, I feel that the branch for breezy:
a. happened too soon - it would be better to make a release candidate package 
and test it, fixing any major problems in trunk, then branch

b. lacked attention to the deviation happening between the branch and trunk, 
hence it was later not possible to merge properly. I would suggest that in 
future, changes made in trunk are more regularly merged to the branch, if 
required, during a release cycle and that all enhancements made in the branch 
are merged to trunk on more frequent cycle.

Since a merge was not done properly, the svn log is bound to be missing stuff 
and information in trunk that was not required in the branch, but was still 
useful, may be lost.

There is not much to do now except keep it in mind and learn from it for next 
time.

-- 
Sean Wheller
Technical Author
sean at inwords.co.za
084-854-9408
http://www.inwords.co.za
~~~~~~~~~~~~~~~~~~~~~~~~~
Registered Linux User #375355
http://wenzani.blogspot.com/