When I try to branch from working copy, some files are being marked as
"Replacing Xxx" instead of "Modified Xxx".
My project is structured:
/W project root
/W/App module 'App'
/W/Core module 'Core'
/W/Extra module 'Extra'
with source files such as /W/E/src/com/company/package/XxxYyyZzz.java
6 months ago, this was structured:
/B project root, including random files now in /W/App
/B/src old equivalent of what is now /W/Core/src
/B/extra/src old equivalent of what is now /W/Extra/src
When this was restructured, I created a new root folder /W and
subfolder /W/Core, then copied with history:
/W/App/xyz from /B/xyz
/W/Core/src from /B/src
/W/Extra from /B/extra
Now when I try to branch from working copy where, for example, some src
files in /W/Core/src and /W/Extra/src have been modified, I get:
Added /W-branch copy from /W revision 123
Replacing /W-branch/App copy from /W/App revision 155
Added /W-branch/App/myNewFile.txt
Replacing /W-branch/Core copy from /W/Core revision 155
Replacing /W-branch/Core/src/ModifiedFile.java copy from
/W/Core/src/ModifiedFile.java revision 157
whereas I expect to get:
Added /W-branch copy from /W revision 123
Added /W-branch/App/myNewFile.txt
Modified /W-branch/Core/src/ModifiedFile.java
I notice that when I update immediately before branching, this seems to
clear things up. I don't understand why this is happening and it makes
analysing the log messages much harder. It also means later merging a
branch back can be difficult as the branch point is harder to
determine.
Surely if I have a working copy which was updated wholly to a specific
revision, the entire branch can be summarised by "Copy /W-branch from
/W rev 123" (plus modified files) without any of the "Replacing"
items?
Has something gone wrong with my repository, or is this expected
behaviour? Is it a bug with SVN (if so I will be happy to resubmit
elsewhere with more details about versions etc.)? I never got this
before I moved from the old structure (/B...) to the new (/W...). Is
there any way I can fix this while preserving my history?
Any advice gratefully received.
Steve Spencer
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 8 13:52:15 2007