> ok, so I checked out the subversion repository again (for the
> whole line feed deal), and moved the files from the previous working
> copy over that I wanted. Mainly this was .log* (when I do a `make
> install` I `tee` it into a .log file), but there was also
> www/server_setup.html, which I modified a while back after being
> requested to update it for some documentation glitch I noticed a while
> back (the patch was ignored, but it wasn't well marked either). When I
> moved it into the new working copy I didn't get the customary overwrite
> message from my mv -i. After scratching my head I went into the other
> working copy, moved the file out of the way, and did an "svn up". No
> file. Did it to the old one, file appeared. Ummm... HELP!!!
Hm...I couldn't get this to reproduce easily here. I checked out a
working copy from a remove svn server (just a test repos), and did
these things:
~/tests/cmpilato % dir
total 28
drwxr-xr-x 3 cmpilato users 4096 Jan 7 12:27 bar/
-rw-r--r-- 1 cmpilato users 4 Jan 16 09:33 foo.c
drwxr-xr-x 3 cmpilato users 4096 Jan 7 12:27 mkdir/
drwxr-xr-x 3 cmpilato users 4096 Jan 7 12:27 newdir1/
drwxr-xr-x 3 cmpilato users 4096 Jan 7 12:28 newdir1-copy-move/
drwxr-xr-x 3 cmpilato users 4096 Jan 7 12:27 newdir2/
drwxr-xr-x 4 cmpilato users 4096 Jan 7 12:27 newdir3/
Okay, so there's a file named foo.c. Now, remove it from the remote
server.
~/tests/cmpilato % svn rm -m "poop" <url_to_foo.c>
Okay, check to make sure that if I were to update right now, I would
see something happen to foo.c.
~/tests/cmpilato % svn st -u
_ * 11 .
_ * 11 ./foo.c
Head revision: 12
Yep, looks good. Now, delete the foo.c file.
~/tests/cmpilato % rm foo.c
Fine. Now update. As you see below, first update restores things
from text-base, then runs the actual update process (which deletes the
now-missing file).
~/tests/cmpilato % svn up
Restored ./foo.c
D ./foo.c
My first thought is that perhaps the state report sent to the server
when you updated gave it reason to believe that it didn't need to tell
you to delete that file. Beyond that I have no idea what might have
happened. Can you tar up your working copy and send it (off-list) to
me?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:56 2006