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

Some Defects

From: Mark Watts <mwatts3_at_stny.rr.com>
Date: 2003-05-30 18:34:31 CEST

Running WinXP (SP1)
Subversion 0.23

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

  Note also the excessive indentation of the deleted directory and filename

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. When you attempt the merge again it fails because of an
"Obstructed update". NOTE: I think I may have seen something about this
already being reported an in the issue tracker but I could not find it when
I looked.

3. If the trunk has a new directory that has been added, in my case
'\trunk\bin', and then the 'bin' directory has had the svn:ignore property
set on it to ignore *.* in that directory, when the merge is done the 'bin'
directory is added correctly to the trunk but I also have conflict report
for the bin directory with the followin message (2 lines):
-------start of message
prop `svn:ignore': user deleted, but update sets it to '*.*
-------end of message
  a. note the use of '`' in `svn:ignore' instead of the single quote char
  b. why is the message continued on a second line?
  c. why is the conflict reported at all? The directory did not exist in
the branch and was added by the merge.

  NOTE: This MAY be related to issues 1319 and 838 but I don't know enough
yet to be sure.

Sorry for reporting these if they are already known



To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat May 31 01:41:32 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.