From: <anj...@t-...> - 2002-03-25 21:49:04
|
on 25.03.2002 22:02 Uhr, Bill Bumgarner at bb...@co... wrote: > Yes, RE will trash it. However, that is what the > preprocess-before-commit script is for (alternatively, a bundle that loads > into RE and modifies the way plists are saved would work). I have no idea if RE supports loadable bundles...it's not like JB, the app is just a quick and dirty hack anyone with a day or two of free time could probably do better... (yeah, big mouth - that's me:) > Merge problems are primarily caused because the contextual diff generated > by CVS is not generated with knowledge of the data units it is merging. > That is, the diff typically spans some subset of a complete rule -- i.e. > part of a previous rule or the next rule. But with the perl script that makes one rule/line you get: { rules = ( {author = 100; class = com.webobjects.directtoweb.Rule; lhs = {class = com.webobjects.eocontrol.EOKeyValueQualifier; key = task; selectorName = "isEqualTo"; value = edit; }; rhs = {class = com.webobjects.directtoweb.Assignment; keyPath = backgroundColorForTable; value = "#eeeeee"; }; }, {author = 100; class = com.webobjects.directtoweb.Rule; rhs = {class = com.webobjects.directtoweb.Assignment; keyPath = look; value = NeutralLook; }; }, {author = 100; class = com.webobjects.directtoweb.Rule; rhs = {class = com.webobjects.directtoweb.Assignment; keyPath = visibleEntityNames; value = (Article, Asset, JobGroup, Section); }; } ); } Which should not make any conflicts that are a problem. Grm. Does anyone know how to tell Entourage not to wrap lines? Cheers, Anjo |