+1, Andrew's suggestions make good sense. On 11/15/07, Andrew Robinson <[EMAIL PROTECTED]> wrote: > > On 11/15/07, Jeanne Waldman <[EMAIL PROTECTED]> wrote: > > The same fix was in both, but one had different spacing. > > Then it wasn't merged correctly and technically wasn't the same fix > from a repository point of view. With two active versions, ppl. would > be responsible for using svn commands for putting a change set in both > branches and not doing manual edits except for conflict resolution. > > If ppl used the tool correctly, there should not be any such conflicts. > > > Check Adam's wiki about merging the branches > > Yes, this is assuming the current procedure without an active branch on > JSF 1.2 > > > - Jeanne >
-- Grant Smith
