Re: gEDA-dev: noscreen merge

[Peter Clifton <pcjc2-at-NOSPAMcam_dot_ac_dot_uk>]

On Tue, 2007-04-17 at 21:09 +0100, Peter Clifton wrote:
> I'd greatly appreciate it if no-one commits into CVS in the mean time,
> so I may complete this merge commit in one final step.

Thanks everyone, it is merged now!!

Its a really great feeling, to see so many months of coding and testing
get merged back into CVS. Thank you to everyone who has tested, reviewed
and helped with the changes.

Everyone, please update and test it when you get a chance! If there are
any behavioural differences, please let me know.... there aren't
supposed to be any - but the code is a lot lighter!


CVS gurus:

I've left a temporary tag in CVS, noscreen-temp, as I've not pulled the
noscreen-base tag up the HEAD of CVS. (That temporary tag marks where it
should go).

This is because there was a change to CVS head between the final
HEAD->noscreen and noscreen->HEAD merges, meaning the now (otherwise
defunct) noscreen branch misses a change to tragesym.

It should be possible to merge changes between noscreen-base and
noscreen-temp back into the noscreen branch, and if I did this, I'd
probably copy the ChangeLogs from HEAD, essentially making HEAD and
noscreen identical.

This changes the sense of "sync with trunk" and "merge changes from
noscreen" messages, and is what I did when some of noscreen was merged
previously.

Since I don't have any more changes for the noscreen branch, I wounder
if I should bother with this final step or not.

Any thoughts?


Kind regards,
-- 
Peter Clifton

Electrical Engineering Division,
Engineering Department,
University of Cambridge,
9, JJ Thomson Avenue,
Cambridge
CB3 0FA

Tel: +44 (0)7729 980173 - (No signal in the lab!)



_______________________________________________
geda-dev mailing list
geda-dev@moria.seul.org
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev