[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merge weirdness item in WC not under revision control

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-09-10 18:48:03 CEST

Joey Hess <joey@kitenet.net> writes:

> Ben Collins-Sussman wrote:
>> 'svn merge' means, "please apply this patch to my working copy".
>> The patch you specified involves changing a file called 'mood'. But
>> your working copy has no such file -- at least, not under version
>> control. So the patch isn't going to apply cleanly, no matter what
>> you do. If you had been running svn 0.29, it probably would have just
>> said
>> skipping file 'mood'
>> ...and continued on. But you're using an older version, so it was a
>> bit more cranky.
> Makes no sense to me, mood/mood is not and has never been in my
> repository. It's a svn:ignored binary file.

Changes can be merged using

  $ svn merge -rN:M http://host/repo/foo foo

It's a deliberate feature that the target, foo above, can be omitted
if the last component of the URL matches the target, allowing

  $ svn merge -rN:M http://host/repo/foo

to merge changes into foo rather than the current directory.

For some reason this feature only applies if the target is a file and
not a directory. The fact that an unversioned file triggers this
behaviour is probably a bug. (I don't like this sort of feature, so I
not really the best person to determine how it should work as I'd just
remove it.)

Philip Martin
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 10 18:49:09 2003

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.