libgcj-classpath-20060719 merge

Sun Jul 30 13:45:00 GMT 2006

On Fri, 2006年07月21日 at 10:48 -0600, Tom Tromey wrote:
> >>>>> "Haren" == Haren Visavadia <themis_hv@yahoo.co.uk> writes:
>> Haren> svn diff -r113858:BASE
> Haren> svn://gcc.gnu.org/svn/gcc/branches/CLASSPATH
>> I think in this case we want to diff the working tree against the base
> revision.

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.
The above just crashes my svn btw:
svn: subversion/libsvn_client/diff.c:1977: diff_repos_wc: Assertion `!
svn_path_is_url (path2)' failed.
Aborted
Sigh,
Mark