Merge bug?

[Leon Zandman <lz...@lode.nl>]

Hi,

I just noticed something while trying to merge that might be classified
as a bug.

It has to do with the case-insensivity of Windows. Suppose I have this
branch in my repo which is located at:

	svn://localhost/repo/branch/b1

I checked out this branch, but made a typo and checked out the following
URL:

	svn://localhost/Repo/branch/b1
	(notice the upper-case "Repo"!)

This is possible under Windows. The resulting working copy worked just
fine and I could commit etc.

The trouble started when I wanted to merge some changes (some
changes/additions and deletions) from the trunk to this branch. I used
this command:

	svn merge -r400:HEAD svn://localhost/repo/trunk

As you can see I used a lower-case "r" in "repo", whereas my working
copy points to "Repo". The "dry run" worked fine, showing all the files
that should be updated/deleted/added. But when I ran the actual merge it
failed half-way. It had already correctly updated and deleted some
files. But when it came to a file that was added to the trunk, and which
should be added to the branch it showed with the following error
message:

"Error: Copyfrom-url 'svn://localhost/Repo/trunk/staticutils.cpp' has
different repository root than 'svn://localhost/repo/'"

Although this error message makes sense I think it is a bug that the
"dry run" didn't report any errors. And also part of the real merge went
perfectly. It wasn't until the merge procedure had to add a file when
the error was triggered. I think this is inconsistent behaviour, isn't
it?

Greetings,

Leon Zandman


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org