[Laszlo-dev] going to merge devildog to trunk tomorrow morning

[Donald Anderson]

Some thoughts -

In theory, if there is no other svn activity between the time you  
merge trunk->devildog and
the time you merge devildog->trunk, then what you have in devildog  
after your
first merge should be exactly what you want in trunk when you're  
finished.
If you see any conflicts or difficulties, I think that would be your  
guide.

Probably would be good to rsync your svn trees before/after each major  
step for safety.

I remember one messy file renaming issue (ParseTreePrinter.java I think)
that confused one of the merges, perhaps that will reemerge when you  
merge back.

- Don

On Mar 25, 2008, at 5:34 PM, Henry Minsky wrote:

> Can everyone finish checking in to trunk what they need to tonight,  
> and hold off  any new checking in starting tomorrow morning until I  
> sound
> the all-clear. I'm going to do a last merge from trunk to devildog  
> in the morning , and then try to merge it back to trunk.
>
>
> -- 
> Henry Minsky
> Software Architect
> hminsky at laszlosystems.com
>


--

Don Anderson
Java/C/C++, Berkeley DB, systems consultant

voice: 617-547-7881
email: dda at ddanderson.com
www: http://www.ddanderson.com




-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.openlaszlo.org/pipermail/laszlo-dev/attachments/20080325/890dbabf/attachment.html