On 22/09/2015 07:48, Ed Zarkowski wrote:
> Using Repo Browser, I changed the name of "Foo" folder (in the repository), to
> "Foo_Flarkize_Aborted".
>
> I also changed the relevant working folder name from Foo to Foo_Flarkize_Aborted.
>
> I then created a Foo folder, and restored Pre-Flark content to it (from a 7-Zip file, actually).
>
> Using File Explorer, examining Foo and Foo_Flarkize_Aborted revealed the following:
>
> Subfolder Foo has TortoiseSVN icon overlays.
>
> Subfolder Foo_Flarkize_Aborted has no icon overlays.
>
> Furthermore, the icon overlays for "Foo" correctly indicate status relative to repository folder "Foo_Flarkize_Aborted".
>
> In other words, the File Explorer view "looks" just as it would have if I had simply replaced the content of working folder "Foo" with the content from the 7-Zip file.
>
> I don't understand how TortoiseSVN associates working folder Foo with repository folder Foo_Flarkize_Aborted.
>
> I'm speculating that the .svn metadata for my Library contains a reference to the root/trunk of my Library repository, but no direct "lower level" references.
>
> For example, consider the situation prior to my Flarkize efforts.
>
> I would have thought that the .svn metadata contained no "direct" reference to repository folder "Foo" ("linking it" to Working folder "Foo").
>
> Rather, that the association between repository folder "Foo" and working folder "Foo" was implied by the repository hierarchy (and, of course, the association of the working folder "Library" with the trunk within the Library repository).
>
>
>
> My questions are these:
>
> 1) How is my working copy "Foo" able to "refer to" the Foo_Flarkize_Aborted repository folder?
>
> When a repository folder is renamed, does TortoiseSVN remember the original name, and somehow use it?
>
>
> 2) More importantly, is there some way to extricate myself from this mess?
>
> Specifically, create a situation in which the Library repository contains a "Foo_Flarkize_Aborted" branch (reflecting the current trunk/Foo head), and the trunk/Foo head is rolled back to a Pre-Flark state?
>
> A) If I rename the repository folder back to "Foo", will it be, essentially, as if I had never renamed it?
Some of the answers will depend on exactly how you renamed things. The behaviour changes depending on whether you renamed them directly in the Repo-Browser, or in the WC -- and if the latter, whether you did a TSVN -> Rename or just a Windows rename.
Assuming you were in the state where the trunk had been Flarkized but you had not yet done any renaming, then this is the way I would have done what you wanted:
1. Using the repo-browser, *copy* (not rename) the Foo library to a branch (depending on how your branches are organised, this might require copying something higher than just the Foo library).
2. Using the working copy (still on trunk), revert any Flarkizing changes. Typically this involves finding the corresponding commits in the log and "revert changes from this revision" on each one, although if there are nothing *but* Flarkizing commits then you could select the last pre-Flarkizing commit and "revert to this revision" instead.
Whether you can get there from where you are now is a different question that will depend on how you renamed things and which backups you have.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3138904
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-09-22 06:12:12 CEST