Re: [Onboardc-project] RE: Massive CVS updates (from the Forum)

[John W. <or...@ru...>]

> This is a great suggestion.  I was planning on making a branch, but I was=
 still trying to=20
> figure out the best way to merge that branch back in to the main one with=
 as little=20
> mess as possible.  The one thing I really don't want to do is to mess up =
the work that > some of the "real" developers are doing  with bug fixes and=
 enhancements.=20=20

> I think I'll still do it one subdirectory at a time, and probably start w=
ith SrcEdit first,=20
> since the development work on it should slow down with the release coming=
 in March.

This sounds just great! We'll have to establish contact while you're workin=
g on the SrcEdit sources, though.

/John
or...@ru...

> Steve Little wrote:
> > [from Wade, who was having some trouble posting this message:]
> >=20
> >=20
> >>Hi all.  I thought I would post a question before actually doing anythi=
ngto
> >>the CVS repository.  [...] I just want to be sure that when I start com=
itting
> >>the code cleanup, I don't cause others to have to re-edit the files the=
y've
> >>just spent time fixing and testing.
> >=20
> >=20
> > I just had some experience with this sort of thing (massive changes to
> > an evolving CVS repository) at work.  The best way to do this, I think,
> > is to do the following:
> >=20
> >    1) create a branch from mainline (maybe call it
> >       "branch_joey_cleanup")
> >    2) before work on the new branch, tag all the files (maybe call
> >       it "tag_joey_cleanup_start")
> >    3) make all your changes on the branch
> >    4) when you're done with your changes, tag all the files on the
> >       branch (maybe call this "tag_joey_cleanup_end")
> >    5) on mainline, tag all the files (maybe, "pre_merge_joey_cleanup")
> >    6) on mainline, do the following:
> >        cvs update -j tag_joey_cleanup_start -j tag_joey_cleanup_end
> >=20
> > This last one is beautiful -- it merges into mainline (since that's your
> > current branch) all the changes _between_ the two tags.  You may have
> > some conflicts to resolve, but it works surprisingly well.  And, if
> > things go badly, we can always back-up to the 'pre_merge_joey_cleanup" =
tag.
> >=20
> > --
> > Wade
> > wa...@ad...
> >=20
> >=20
> > -------------------------------------------------------
> > SF email is sponsored by - The IT Product Guide
> > Read honest & candid reviews on hundreds of IT Products from real users.
> > Discover which products truly live up to the hype. Start reading now.
> > http://ads.osdn.com/?ad_id=3D6595&alloc_id=3D14396&op=3Dclick
> > _______________________________________________
> > onboardc-project mailing list
> > onb...@li...
> > https://lists.sourceforge.net/lists/listinfo/onboardc-project
> >=20
> >=20
>=20
> --=20
> ------------
> "Debugging is twice as hard as writing the code in the first place.
> Therefore, if you write the code as cleverly as possible, you are,
> by definition, not smart enough to debug it." -- Brian W. Kernighan
> ------------
> Joey Bernard
> System Architect
>=20
> Projects Division, CARIS
> 115 Waggoners Lane, Fredericton NB, E3B 2L4 CANADA
> Phone:  (506) 458-8533 (Reception)  (506) 462-4206
> Fax:    (506) 459-3849
>=20
> CARIS has expanded to new office facilities. Our new mailing address is:
>=20
> 115 Waggoners Lane, Fredericton, New Brunswick, E3B 2L4, Canada.
>=20
> Visit us on the web at http://www.caris.com
>=20
> NO BINDING CONTRACT WILL RESULT FROM THIS E-MAIL UNTIL SUCH TIME AS A
> WRITTEN
> DOCUMENT IS SIGNED ON BEHALF OF THE COMPANY.
>=20
>=20
> -------------------------------------------------------
> SF email is sponsored by - The IT Product Guide
> Read honest & candid reviews on hundreds of IT Products from real users.
> Discover which products truly live up to the hype. Start reading now.
> http://ads.osdn.com/?ad_id=3D6595&alloc_id=3D14396&op=3Dclick
> _______________________________________________
> onboardc-project mailing list
> onb...@li...
> https://lists.sourceforge.net/lists/listinfo/onboardc-project
>=20