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

Re: "not under version control" error - continued

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2004-02-11 02:08:24 CET

"Mike Javorski" <mjavorski@spokesoftware.com> writes:

> Any news on this issue? There has been another occurrence of this
> merge bug reported by Adam Lackorzynski in the dev list
> (http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=56106)

It's still a bug. The dry-run merge doesn't handle properties on
added files. Is there an issue in the issue tracker? If not, you
should raise one.

$ svnadmin create repo
$ svn co file://`pwd`/repo wc
$ svn mkdir wc/foo wc/bar
$ svn ci -m "" wc
$ touch wc/foo/zig
$ svn add wc/foo/zig
$ svn ps x x wc/foo/zig
$ svn ci -m "" wc
$ svn merge --dry-run -r1:head file://`pwd`/repo/foo wc/bar
../svn/subversion/clients/cmdline/delete-cmd.c:47: (apr_err=200005)
svn: Use --force to override this restriction
../svn/subversion/libsvn_wc/props.c:279: (apr_err=200005)
svn: 'wc/bar/zig' is not under version control
$ svn merge -r1:head file://`pwd`/repo/foo wc/bar
A wc/bar/zig

Philip Martin
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Feb 11 02:09:18 2004

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.