I have a test of the emergency wafflecone patch system. Amy has asked me to check in the fix for LPP-4615 (remove duplicate resource warning), which I checked into trunk as r6687.
Who is going to merge it into wafflecone, or check in a copy manually? I'd be happy to, if necessary.. On 9/28/07, P T Withington <[EMAIL PROTECTED]> wrote: > > We got a failure to communicate here. You and Ben are telling Josh > one thing, Amy and I another. > > I understand the nifty merge tool, but it also burns us when the > person doing the merging is not familiar with the change being made, > or takes time away from the person doing the merging that could be > better used working on their own bugs. > > Wafflecone is a released branch. The only changes that get made in > released branches are changes that have been approved for a follow-on > point release from that branch. There should _never_ be anything > automatically merged _to_ or _from_ Wafflecone, because of this. As > that branch and the trunk diverge, it will become less and less > practical to use svn merge to even 'prototype' a change in Wafflecone > from the trunk. > > For changes to a _released_ branch, I want the developer of the > change to make the change, so we ensure that the change is correctly > adapted to the released branch. If the change happens to be needed > in trunk too, the developer _may_ find the svn merge tools useful, > but they should not rely on svn, and we should not expect that anyone > other than the developer can make the merge, as they will not be > familiar enough with the details to resolve skew or conflict. > > My 2p. > > On 2007-09-28, at 18:23 EDT, Max Carlson wrote: > > > 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 [EMAIL PROTECTED] > >>> 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 > > -- Henry Minsky Software Architect [EMAIL PROTECTED]
