[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: Joey Hess <joey_at_kitenet.net>
Date: 2003-09-10 20:20:22 CEST

Philip Martin wrote:
> 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.)
  
  WCPATH is the working copy path that will receive the changes.
  If WCPATH is omitted, a default value of '.' is assumed, unless
  the sources have identical basenames that match a file within '.':
  in which case, the differences will be applied to that file.

That almost fits, but I see the same behavior if I use the form with an
explicit WC directory -- note the trailing dot:

joey_at_dragon:~/tmp/mood.bak>svn merge -r1705:1746 svn+ssh://svn.mooix.net/home/svn/mooix/branches/moox_embedding_rewrite_branch/mood .
svn: Can't find an entry
svn: Can't merge changes into 'mood':it's not under revision control.
zsh: exit 1 svn merge -r1705:1746 .

It's apparently doing the same thing it would if I left off the trailing
dot:

joey_at_dragon:~/tmp/mood.bak>svn merge -r1705:1746 svn+ssh://svn.mooix.net/home/svn/mooix/branches/moox_embedding_rewrite_branch/mood
svn: Can't find an entry
svn: Can't merge changes into 'mood':it's not under revision control.
zsh: exit 1 svn merge -r1705:1746

If I go up a directory, and tell it to use the mood.bak directory, it
does work:

joey_at_dragon:~/tmp>svn merge -r1705:1746 svn+ssh://svn.mooix.net/home/svn/mooix/branches/moox_embedding_rewrite_branch/mood mood.bak
U mood.bak/mood.c
U mood.bak/perl.c

-- 
see shy jo

  • application/pgp-signature attachment: stored
Received on Wed Sep 10 20:18:43 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.