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

How to merge the histories of two files (like Wikipedia histmerge)?

From: Stewart Gordon <smjg_at_iname.com>
Date: Wed, 5 Oct 2016 02:49:13 -0700 (PDT)


Sorry if this has been asked before. I did a quick search but didn't find anything.

This is the problem I am trying to solve. Somebody took a file from the repository and, in error, committed a new version of it as a new file. Let's call the original file A, and then new one B. Luckily, in this instance both A and B are still in the repository at the moment. There has been a further change to B since the incident.

Is there a way to merge the histories of the two files - so that we have only one file in there, whose revision history is the history of A followed by the history of B - just like what is frequently done by admins on Wikipedia to repair cut and paste moves?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-10-05 11:53:56 CEST

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