On 07.01.2016 15:11, Tomas Vadfors wrote:
> Hello!
>
> In one repository, I have the following paths (among others) from trunk:
>
> trunk/Software/Application/MCU1/Source/Sources/
> trunk/Software/Application/MCU1/Source/Headers/
>
> I've attached parts of screenshots of the revision graphs I get when looking
> from the three last directories in the first path. The problem is the graph
> shown when creating the revision graph for the "Source" folder.
>
> From the first screenshot (01_...), it is obvious that there are commits both
> before and after revision 421. I've also attached a screenshot from the log
> of the "Source" folder, which seem to function normally. At rev. 421 the
> action for the "Source" folder is "Replacing". This seems correct, since I
> deleted the folder entirely using TortoiseSVN and then added a new folder
> with the same name.
>
> The graph generated from "Source" is also generated from any branch, since
> all our branches are taken from this folder level.
>
> I tried the following in a local copy of the entire repository:
> 1. Export everything under Source/.
> 2. Delete the folder "Source" using TortoiseSVN-delete.
> 3. Commit.
> 4. Create and add a new folder, also named "Source".
> 5. Commit.
> 6. Copy and add the stuff I exported in step 1.
> 7. Commit.
>
> After doing this, the revision graph for all three folders looked ok, but
> contained no record of anything having happened before these steps. Looking
> at an earlier revision in the repo browser, however, and bringing up the
> revision graphs from there, I was still able to see all the history.
The revision graph shows you the copy-history of the item you show the
graph for.
Which means, in your case here it shows the graph of "Source" from HEAD.
And that source was added after another completely unrelated folder
named "Source" was removed. Since the first "Source" folder has no
connection to the second "Source" folder, the revgraph doesn't show
anything for the first "Source" folder.
> I have two questions about this:
>
> 1. The solution I tried (1-7 above) is acceptable to us. Is there any risk
> of causing future problems with the repository by doing that?
Problems: no.
But you've lost the history. For SVN, those two folders have no relation
or connection at all.
> 2. Is there a better way to fix the repository so that the problem is
> eliminated?
If you want to do a proper "replace" in the future, leave out step 3 in
your example above: after 'svn rm', add the folder and do 'svn add' and
*then* commit that.
And if you want to keep the history: don't delete the folder but copy
the files over the old ones and then commit.
> We're using:
> TortoiseSVN 1.7.12, Build 24070 - 64 Bit
> Subversion 1.7.9
Yikes!
Please update.
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=3154170
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-01-07 23:08:00 CET