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

Merge Issue: Wrong modifications displayed?

From: Thomas Lehmann <t.lehmann_at_rtsgroup.net>
Date: Mon, 27 Oct 2008 08:30:31 -0700 (PDT)

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
myself!

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?

root
 | - a
 | - b
 | - ...

kindly
Thomas

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-27 16:32:59 CET

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