Re: Moved files in subversion and modified working copy

2005-07-25 Thread Simon Pepping
I use svn, version 1.0.9 (r11378), as provided by Debian. If I remember correctly, it said something like: Will not remove modified file X, and then stopped updating. Perhaps different clients act differently. I will get through it, one way or the other. Regards, Simon On Mon, Jul 25, 2005 at 05:

Re: Moved files in subversion and modified working copy

2005-07-25 Thread Jeremias Maerki
I've just tried to simulate that scenario here. Here, my file with the local changes was left alone and now appears as if it were newly added. I could now merge it into the moved file. I wonder why it stopped updating on your machine (I've used SVN 1.2.1). Do you get an error message when the updat

Moved files in subversion and modified working copy

2005-07-22 Thread Simon Pepping
Hi, I tried out how subversion update reacts to files that were moved in the repository and were modified in the working copy. It does not seem to be very helpful. It stopped updating until I had moved the changes out of the way. So how do I go about moving my changes? The hard way: create a diff