Re: Merge Issue: Wrong modifications displayed?
Thomas Lehmann wrote:
> Probably a misunderstanding by myself...
> Following situation (TortoiseSvn 1.5.4):
> I'm merging a branch into the main branch. From the
> main branch I have a checkout (up-to-date).
> After merging I'm trying to commit and in the list of
> mergable elements I see folders not touched by
> In the example I have done a modification in a file of folder "a"!
> Committing "root" folder "b" will be displayed too and the difference
> there is just the merge tracking information!
> Not all folders beyond root are listed in the commit!
> Any explanation for this?
> | - a
> | - b
> | - ...
Search the Subversion mailing list for "svn:mergeinfo": the mergeinfo
properties will get reduced a lot in the next Subversion release, but
for now those properties are set on folders even if they're not part of
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-10-27 19:08:13 CET
This is an archived mail posted to the TortoiseSVN Users