libgcj-classpath-20060719 merge

Mon Jul 31 17:06:00 GMT 2006

Tom Tromey writes:
 > >>>>> "Haren" == Haren Visavadia <themis_hv@yahoo.co.uk> writes:
 > 
 > Haren> I think a better approach would be have
 > Haren> "gcj-classpath-integration" branch, were the merge of
 > Haren> trunk and classpath branch is done and all changes are
 > Haren> made and committed. The diff would easily made and to
 > Haren> apply it to trunk would be simple merge and commit. If
 > Haren> you want an example of this, I can provide one.
 > 
 > It seems weird that in order to do a merge we must create a third
 > branch.
 > 
 > However, we're pretty unlikely to either fix svn or switch version
 > control systems... so we've got to work around its deficiencies
 > somehow. If Mark wants to create an integration branch that is fine
 > by me.
svn copies and branches are low cost. We hurt ourselves by fighting
svn.
Create a merge branch. Generate the diff to post from that. Then
commit the merge branch. It's the svn way. And it's better than the
error-prone business than posting and applying patches.
Andrew.