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

Re: Some Defects

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-05-30 20:05:29 CEST

"Mark Watts" <mwatts3@stny.rr.com> writes:

> 1. Doing 'svn merge --dry-run -r 89:124 file:///c:/svn/repos/trunk' results
> in the following error message
> svn: Working copy not locked
> svn: no write-lock in: src
> now if I do a regular merge it goes past this point just fine however the
> item that would have been printed had the dry run worked is:
> D src\file1.txt

I believe I fixed this a couple of days ago.

> 2. If for some reason the merge fails and you do a 'svn revert -R .' on the
> tree to put everything back, files that have been added as part of the merge
> are not deleted.

That is how revert is intended to work.

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat May 31 00:38:49 2003

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

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