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

[TSVN] File moved on server not merged on client

From: Matthew Mastracci <matt_at_aclaro.com>
Date: 2005-03-14 18:10:13 CET

I've encountered a problem with TortoiseSVN (or is it Subversion itself)
that manifests itself when a file is moved on the server by one user and
modified locally by another.

The steps to reproduce this problem are:

1. Checkout a repository twice, once to co1 and once to co2.
2. Create a directory "test" in co1, add it to SVN and update in co2.
3. Create a file "x.txt" in the root of co1, add it to SVN and update
in co2.
4. Move the file x.txt to the "test" directory in co1 and commit to SVN.
5. Modify the "x.txt" file in co2 (still in the root directory since it
hasn't been updated).
6. Try to commit in co2, error message is;
File not found: transaction '7-1', path '/x.txt'
7. Do an update in co2, modified file be becomes unversioned and new
version is created under test directory.

I don't know if it's my lack of experience with Subversion, but I would
have expected the file's server-side move to be "merged" on the client
side after an update.

Is this a bug in TortoiseSVN or Subversion, or is expected behaviour
with server-side moves in Subversion? I've scoured the Subversion
documentation and I can't find any reference to what is supposed to
happen in this case.

Matt.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Mar 14 19:35:31 2005

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

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