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

Moving files

From: Giulio Troccoli <Giulio.Troccoli_at_uk.linedata.com>
Date: 2007-11-30 13:07:10 CET

I have spent a couple of days trying to find out what went wrong and
when I did I realised that maybe what Subversion did is not really
correct, and I would like to hear what the list thinks about it.

I have a repository where we keep the code for few versions of the
product we support. We need to keep old versions because we do, from
time to time, fix old versions.

Let' say that we have version 5.00, 5.03, 5.11 and 5.20. The code in
5.20 is exactly the same as in 5.11 plus something more (specific to
5.20). The code in 5.11 is exactly as the code in 5.03 plus something
else. And so forth.

So, if I change something in 5.03 I will then merge those changes to
5.11 and then to 5.20.

The change I did in 5.03 was to move some files, specifically all the
header files in the 5.03/src/include directory to the
5.03/src/include/inc directory. When I merged these changes in 5.11 I
basically lost all changes made specifically for 5.11 because the merge
deleted all the header files in 5.11/src/include and then add the header
files that were in 5.03/src/include into 5.11/src/include/inc.

Knowing that a move in Subversion is actually a delete followed by an
add, I can understand what Subversion did, but I wonder if a "proper"
move operation would behave correctly in this case.

Any comments?

Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 30 13:07:45 2007

This is an archived mail posted to the Subversion Users mailing list.

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