I am just testing out a our new SVN 1.6 implementation and am using
1.6.6 tortoise SVN client.
I have merged revisions x-y from branch A to branch B, resolved
conflicts and committed. I now have svn_megeinfo property correctly set
on Branch B indicating the revisions merged and where they came from.
if I try to repeat the process the original revisions I selected are now
correctly shown as grey lines.
However if I now view the revisions log for Branch B I see my commit
for the merge action but when I check the "Include Merged revisions"
check box it does not show me the revisions that made up this single
commit - it does nothing. According to the manual...
"If you want to see the detail of which revisions were merged as part of
that commit, use the Include merged revisions checkbox. This will fetch
the log messages again, but will also interleave the log messages from
revisions which were merged. Merged revisions are shown in grey because
they represent changes made on a different part of the tree."
This is not happening for me - are you able to provide any insight as to
why this might be?
Microsoft Development Team Lead
GAME STORES GROUP LTD
T: 01256 784323
E: Nicola.Chowings_at_game.co.uk <mailto:Nicola.Chowings_at_game.co.uk>
Please consider the environment before printing this email.
GAME Group plc, winners of:
2009 Retail Week Awards - Speciality Retailer of the Year
2009 National Sales Awards - Sales Training Programme/Initiative of the Year
2008 Econsultancy Innovation Awards - Innovation in Online Acquisition
2008 MCV Awards - Specialist Retailer of the Year
2007 Golden Joystick Awards - Retailer of the Year
2007 MCV Awards - Specialist Retailer of the Year
2006 Golden Joystick Awards - Retailer of the Year
This e-mail and any files transmitted with it are confidential and intended solely for the use of the
individual or entity to whom they are addressed. If you have received this e-mail in error please
notify the system manager at:
The recipient acknowledges that the transmissions made via the Internet can be corrupted and therefore
THE GAME GROUP PLC and any of its subsidiaries do not give any warranty as to the quality or accuracy of
any information contained in the message or assume any liability for it or for its transmission, reception or storage.
This footnote also confirms that this e-mail message has been swept by anti-virus software for the presence of computer viruses.
Registered Number: 1937170
Registered Office: Unity House, Telford Road, Basingstoke, Hampshire. RG21 6YJ Registered in England and Wales.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-08 19:31:45 CET