libgcj-classpath-20060719 merge

Sun Jul 30 16:20:00 GMT 2006

--- Mark Wielaard wrote:
> It seems we want it against the trunk head revision.
> After the merge and
> manual cleanup the files in the working dir have
> different bases
> depending on whether they were already on the trunk,
> were merge into the
> working dir from the branch, or added by hand. But
> the svn documentation
> is confusing.

I think a better approach would be have
"gcj-classpath-integration" branch, were the merge of
trunk and classpath branch is done and all changes are
made and committed. The diff would easily made and to
apply it to trunk would be simple merge and commit. If
you want an example of this, I can provide one.

___________________________________________________________ 
Try the all-new Yahoo! Mail. "The New Version is radically easier to use" Â– The Wall Street Journal 
http://uk.docs.yahoo.com/nowyoucan.html