On 08.01.2010 19:28, Nicola Chowings wrote:
> 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?
This only works if your svn server also supports merge tracking. That
means your server must be version 1.5 or higher.
> Many thanks
> *Nicola Chowings*
> Microsoft Development Team Lead
> GAME STORES GROUP LTD
[snip 47 lines of crap]
We have a winner! more than 50 lines of crap!
I have nominated you for the next Email Disclaimer Awards:
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-09 18:53:37 CET