Moving files between folders in repo-browser; revision history lost?
Andrew Cushen
I am using TortoiseSVN, and the VisualSVN add-in for Visual Studio. After
reading the manual, I realized that our folder structure was not optimal.
Instead of having a setup like:
App1
--branches
--tags
--trunk
We instead have a format like this:
branches
--app1
--app2
Tags
--app1
--app2
etc. We are looking to move to the first structure, above, where each app
has its own folder and the branches/tags/trunk folders are beneath each
app's folder.
Looking at the manual, it appeared that we could simply create the new
folders in the Repo-browser, then move the contents of the folders from the
old folders to the new folders by dragging them in the Repo-browser, and
keep our revision history. Unfortunately, it appears that this is not the
case. The history of the files in the new folders only goes back as far as
the move into the new folders.
So, I have 2 questions: first, what is the correct way to do a move like I
outlined above, and, second, is there any way to fix the missing history on
the files we moved?
Thanks,
-Andrew
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2443241
To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].
Stefan Küng
The history is not lost. There's a checkbox in the log dialog "stop on
copy/rename". Make sure it isn't checked and you'll see the full history.
If that doesn't work, clear the log cache (settings dialog, saved data,
hit the 'clear' button).
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2443249
Andrew Cushen
OK, I can see the previous revisions now-- but _only_ when I look at the
original folder in the original location. When I look at the trunk in the
new folder, it only shows revisions back to when we moved the files into the
new folder. In fact, when I look at the log in the new folder, it refuses to
allow me to set the "From:" date back past the date the new folders were
created. Is this expected behavior? It seems that SVN does not see that the
trunk in the new folder is the same trunk as the one in the original folder.
It's as if I "disconnected" the trunk when I moved it to the new folder in
the Repo-browser.
And, more importantly, the need that led to the original question: after
moving the trunk to a different folder in the Repo-browser, we created a dev
branch from the trunk in the new folder, which we are now unable to merge
back to the trunk in the new folder. When we try to do this, following the
Help file's instructions to check out the trunk in its new location to the
working copy, then try to merge the dev branch, we do a Test Merge, and get
this message:
Error "[dev branch] must be ancestrally related to [trunk]@327"
So, it seems that SVN also thinks our dev branch, created off the trunk in
the new folder, is not related to the trunk it was created from! We have
tried setting the Merge Depth to "Fully recursive", and also to "Working
copy" but both ways result in the same error when we try a Test merge.
Any ideas? I have just upgraded our VisualSVN server to 2.0.8, TortoiseSVN
on the clients to 1.6.7, and VisualSVN to
1.7.7.
Thanks,
-Andrew
-----------------------------------------------------------
-----Original Message-----
From: Stefan Küng
<snip>
Sent: Saturday, January 30, 2010 3:05 AM
Subject: Re: Moving files between folders in repo-browser; revision history
lost?
<...snip...>
The history is not lost. There's a checkbox in the log dialog "stop on
copy/rename". Make sure it isn't checked and you'll see the full history.
If that doesn't work, clear the log cache (settings dialog, saved data,
hit the 'clear' button).
Stefan
------------------------------------------------------
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2443722
Lorenz
>Stefan:
>OK, I can see the previous revisions now-- but _only_ when I look at the
>original folder in the original location. When I look at the trunk in the
>new folder, it only shows revisions back to when we moved the files into the
>new folder. [...]
if I got you right, you created the new folder and then moved the
files only?
I that case the folder history won't go back beyond its creation.
You should have moved/renamed the folder(s) e.g.
svn move <repoURLY>/trunk/app1 <repoURL>/app1/trunc
--
Lorenz
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2443749
Stefan Küng
> Stefan:
>
> OK, I can see the previous revisions now-- but _only_ when I look at the
> original folder in the original location. When I look at the trunk in the
> new folder, it only shows revisions back to when we moved the files into the
> new folder. In fact, when I look at the log in the new folder, it refuses to
> allow me to set the "From:" date back past the date the new folders were
> created. Is this expected behavior? It seems that SVN does not see that the
> trunk in the new folder is the same trunk as the one in the original folder.
> It's as if I "disconnected" the trunk when I moved it to the new folder in
> the Repo-browser.
The from/to date selectors are only for filtering what's already loaded.
If you want to use dates to fetch the log, use the "show all" button
(press on the arrow, then choose "revision range" from the menu and
enter the dates in the svn format).
>
> And, more importantly, the need that led to the original question: after
> moving the trunk to a different folder in the Repo-browser, we created a dev
> branch from the trunk in the new folder, which we are now unable to merge
> back to the trunk in the new folder. When we try to do this, following the
> Help file's instructions to check out the trunk in its new location to the
> working copy, then try to merge the dev branch, we do a Test Merge, and get
> this message:
>
> Error "[dev branch] must be ancestrally related to [trunk]@327"
>
> So, it seems that SVN also thinks our dev branch, created off the trunk in
> the new folder, is not related to the trunk it was created from! We have
> tried setting the Merge Depth to "Fully recursive", and also to "Working
> copy" but both ways result in the same error when we try a Test merge.
>
> Any ideas? I have just upgraded our VisualSVN server to 2.0.8, TortoiseSVN
> on the clients to 1.6.7, and VisualSVN to
> 1.7.7.
Sure, you've replaced the trunk. The dev branch you originally created
is ancestrally related to the original trunk, not the new one you
created. Use the merge dialog and check the box "ignore ancestry" on the
last page of the merge wizard.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2443919
Andrew Cushen
I'm still having issues.
< The from/to date selectors are only for filtering what's already loaded.
< If you want to use dates to fetch the log, use the "show all" button
< (press on the arrow, then choose "revision range" from the menu and
< enter the dates in the svn format).
OK.
< Sure, you've replaced the trunk. The dev branch you originally created
< is ancestrally related to the original trunk, not the new one you
< created. Use the merge dialog and check the box "ignore ancestry" on the
< last page of the merge wizard.
OK, I tried this, again with Merge Depth to "Fully recursive", and also to
"Working
copy" but both still result in the same error on Test merge.
Just to be clear-- I created the dev branch AFTER I moved the files to the
new trunk folder, and am attempting to merge the dev branch back to the new
trunk folder it was created from. This is what's failing.
Am I better off giving up on the new trunk folder, reverting the delete I
did on the files in the original folder, then moving THAT folder to the new
folder tree? Would I then be able to merge the dev branch back, even though
I branched off the version I moved incorrectly to the new folder?
Thanks,
-Andrew
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2443936
Stefan Küng
> < Sure, you've replaced the trunk. The dev branch you originally created
> < is ancestrally related to the original trunk, not the new one you
> < created. Use the merge dialog and check the box "ignore ancestry" on the
> < last page of the merge wizard.
>
> OK, I tried this, again with Merge Depth to "Fully recursive", and also to
> "Working
> copy" but both still result in the same error on Test merge.
Did you try a real merge?
> Just to be clear-- I created the dev branch AFTER I moved the files to the
> new trunk folder, and am attempting to merge the dev branch back to the new
> trunk folder it was created from. This is what's failing.
Did you specify a revision range to merge? If you leave that text box
empty, the merge tries to merge everything that hasn't been merged yet
from revision one to HEAD. But since revision 1 doesn't relate to the
trunk you have now, you could get into trouble.
> Am I better off giving up on the new trunk folder, reverting the delete I
> did on the files in the original folder, then moving THAT folder to the new
> folder tree? Would I then be able to merge the dev branch back, even though
> I branched off the version I moved incorrectly to the new folder?
You could try that, but I would first check my suggestions above.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2443943
Andrew Cushen
We decided to just merge the dev branch back to the original trunk, and it
appears to have worked.
However, I would like to make sure that I understand the correct process for
what we botched earlier. So...
- Given this situation: we want to move from a folder layout where all the
different projects are under one trunk folder together, one branches folder
together, etc. to a layout where each project has its own set of
trunk/branches/tags folders:
Is the correct process to:
- open the Repo-browser; create a new "master" folder for each project
- move, by dragging, each project's sub-folder from the original trunk
folder to its new "master" folder
- re-name the trunk folder to "trunk"
And then do this for the branches and tags folders:
- in the Repo-browser, create tags and branches folders under the new
"master" folder
- move the tags folders into the just created "tags" folder under the master
- do the same for the branches folder
Will this give us what we want-- a new folder structure with an unbroken
revision history? Or am I totally misunderstanding again? :-)
Thanks for your time.
-Andrew
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2443950
Bob Archer
>
> We decided to just merge the dev branch back to the original trunk, and it
> appears to have worked.
>
> However, I would like to make sure that I understand the correct process
> for
> what we botched earlier. So...
>
> - Given this situation: we want to move from a folder layout where all the
> different projects are under one trunk folder together, one branches
> folder
> together, etc. to a layout where each project has its own set of
> trunk/branches/tags folders:
>
> Is the correct process to:
>
> - open the Repo-browser; create a new "master" folder for each project
> - move, by dragging, each project's sub-folder from the original trunk
> folder to its new "master" folder
> - re-name the trunk folder to "trunk"
>
> And then do this for the branches and tags folders:
>
> - in the Repo-browser, create tags and branches folders under the new
> "master" folder
> - move the tags folders into the just created "tags" folder under the
> master
> - do the same for the branches folder
>
>
> Will this give us what we want-- a new folder structure with an unbroken
> revision history? Or am I totally misunderstanding again? :-)
>
That should work. Although I take a "slightly" different approach. I would copy say /repo/project1 to /repo/project1/trunk and then delete /repo/project1. But, I think the end result is basically the same since a "move" in subversion is pretty much a copy and a delete.
BOb
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2443953
Andrew Cushen
copy say /repo/project1 to
< /repo/project1/trunk and then delete /repo/project1. But, I think the end
result is basically the same since a "move"
< in subversion is pretty much a copy and a delete.
< BOb
Thanks, Bob!
-Andrew
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2443956
Jeremy
I have moved my folder from one part of the repository to another by dragging and dropping in the Tortoise Repo Browser. I also tried doing the same with the svn move command via the command line. Both end up with the same results. The history is available at the level of the folder that was moved, but if the history is viewed from its parent folder, the history is lost. Stop on copy is Not checked.
Is this the expected behavior or is there something going wrong here?
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2643368