Hello,
I'm using TortoiseSVN as my SVN client.
How can I know if a file was merged in the past ?
Thank you.
+2
A:
Right click on the file, and go to TortoiseSVN>Show log - that should show you all actions performed on the file in the past. Tick the 'Include merged revisions' tickbox at the bottom of the dialog and you should be able to track your merges.
Mark B
2009-10-06 14:48:02
do you mean a green line in the log window ?
Oded
2009-10-06 14:57:21
At the bottom of the Log Messages dialog there's a tickbox that reads 'Include merged revisions' - tick that and you should be able to see your merges. I've edited my answer to include a good link.
Mark B
2009-10-06 15:02:21
It works. thanks.1. Is there a way to see it in the revision graph to TortoiseSVN like the graph in WinCVS ?2. if I converted the repository from CVS, do the merges made before will be shown as well ?
Oded
2009-10-06 15:09:48
I'm not familiar with WinCVS, but try right clicking the file and selecting TortoiseSVN>Revision graph?
Mark B
2009-10-06 15:24:46
I have. there is no mention of merges in the revision graph...
Oded
2009-10-06 16:11:47
Sorry then, I don't know.
Mark B
2009-10-06 16:13:52