[Laszlo-dev] IF YOU MERGE

[Max Carlson]

I'd rather that Ben or me handle this process.  I'll take care of both 
hand merges.  In the future, please notify Ben and me when you do a hand 
merge.  Thanks!

Benjamin Shine wrote:
> 
> When merging things between branches, it is important to keep the 
> metadata up to date. We use svnmerge.py to track which changes have been 
> merged. If you merge something by hand, you also have to update the 
> metadata to indicate that it's been merged.
> 
> To record that something has been hand-merged, after you have 
> hand-merged it, go to $LPS_HOME, get your tree to pristine, and do 
> something like this:
> 
> $ svnmerge -S wafflecone --record-only -r REVISION
> 
> Then to commit that change (only the metadata change)
> $ svn commit -F svnmerge-commit-message.txt .
> 
> I have this in my .bash_profile:
> alias svnmerge='python ~/src/svn/tools/svn/svnmerge.py '
> 
> If this does not make sense, PLEASE DO NOT MERGE ANYTHING, but talk to 
> Max or me and we'll help.
> 
> Josh, can you update the metadata when you commit this change?
> 
> -ben
> 
> 
> 
> 
> On Sep 28, 2007, at 2:13 PM, J Crowley wrote:
> 
>> Change 20070928-jcrowley-u by jcrowley at doctormanhattan.mshome.net on 
>> 2007-09-28 17:07:30 EDT
>>     in /Users/jcrowley/src/svn/openlaszlo/wafflejujube
>>     for http://svn.openlaszlo.org/openlaszlo/branches/wafflecone
>>
>> Summary: [this has been fixed in trunk; Amy wants this integrated
>>     into Jujube] HAND-MERGE: DHTML calendar demo wigs out on
>>     opening Event Info
>>
>> New Features:
>>
>> Bugs Fixed: LPP-4175 - DHTML calendar demo wigs out on opening Event Info
>>
>> Technical Reviewer: pbr
>> QA Reviewer: max
>> Doc Reviewer:
>>
>> Documentation:
>>
>> Release Notes:
>>
>> Details: Hand-merging r6676 from trunk into jujube.
>>
>> Tests: Run modified Calendar versus unmodified in DHTML; note
>>     the modified version doesn't slide over all crazy-like
>>     when the info panel is opened by clicking the 'i' on
>>     a selected event tag.
>>
>> Files:
>> M      demos/calendar/infopanel.lzx
>>
>> Changeset: 
>> http://svn.openlaszlo.org/openlaszlo/patches/20070928-jcrowley-u.tar
> 

-- 
Regards,
Max Carlson
OpenLaszlo.org