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

#830 hits again (and Neon 0.24 question)

From: Sergey A. Lipnevich <sergeyli_at_pisem.net>
Date: 2003-06-24 01:52:26 CEST

Server: 0.23.0+, neon 0.23.9 on Linux
Client: TortoiseSVN 0.11.2 with Subversion 0.23, as well as 0.23.0
Windows binary from Subversion's file sharing area


I hit issue 830 message as described in
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgId=260204. The
way I did it (I think) was the succession of:

   1. on the trunk, change lots of files
   2. add and delete files throughout the tree
   3. rename one directory from ProjectWeb to simply Web
   4. delete two directories
   5. commit (OK)
   6. merge into branch (seemingly OK)
   7. try committing, successfully (because a new revision was created)
      but with an error from svn_io_<something> about not finding some
      unrelated file "folder.gif"
   8. copy (not svn cp) folder.gif over to make SVN happy (it was
      present on the trunk)
   9. now when I commit I get the message "Bogus URL, Commit failed,
      Commit item branch/../Images/b-start.gif has copy flag but no
      copyfrom url, See issue #830

The b-start.gif file that I'm receiving a message about was in the very
first revision of the trunk before branch was even made, and it didn't
change since, but it was in the renamed directory. Following the advice
in the thread above, I checked out a fresh WC (I tried cleaning up,
recovering repository, updating WC, and theological reasoning, but
neither helped). Now

    * trunk only has the newly renamed directory, branch has both old
      and new;
    * trunk doesn't have any deleted directories, branch has both;
    * in the old WC, this file has copied="true" in the "entries" for
      the new directory, no such attribute in the old directory;
    * in the new WC, file doesn't have copied="true" in either "entries"
      file for old or new directory;
    * files that were /added/ on the trunk to a renamed directory, and
      are before b-start.gif in the "entries", are fine, and have been
      commited during step 6 above
    * the worst part: svn.exe segfaults during merge operation if I try
      repeating it on the new WC in exactly same way as action 5 above

I did merges before on this repo, but never directory renaming or
deletion. Also, I can't use the latest Subversion because there's no
TortoiseSVN for it, and other people depend on this repository.
My question is, should I use the old WC, clean up "entries" from the
"copied" attribute, and try committing again, or using the new WC,
delete a ProjectWeb (old) diectory on a branch as well as delete two
"deleted" dirctories?

Also, I saw that Neon 0.24.0 is out, and tried compiling it with
Subversion. This fails because there's no more type ne_xml_elm in Neon.
Do you have any plans for migration? I could file an issue on this and
try creating a patch, if somebody is willing to give me a hint on where
to start.

Thank you!

Received on Tue Jun 24 01:53:46 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.