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

Re: Merge showing many "modified" files with no differences

From: Dave Lawrence <dlawrence_at_ad-holdings.co.uk>
Date: Mon, 28 Jan 2008 19:00:19 +0000

Stefan Küng wrote:
> Jim Garrison wrote:
>> It gets worse... The behavior I described occurs when I click the "Diff"
>> button on the merge dialog. When I do a "Dry Run", a completely
>> different (and incorrect) set of files is listed.
>> Here's the procedure I followed:
>> 1) Created the branch, did some work and checked it in on the branch.
>> 2) About a week later, merged differences from trunk into the branch and
>> committed on the branch
>> 3) SVN switched my local workarea back to the trunk
>> 4) Attempted a merge from the branch back to the trunk revision. In the
>> merge dialog, the "from" revision was the branch HEAD, and the "to"
>> revision was the trunk HEAD.

I also found that I ended up with a working copy with no mods when I
tried to merge "from" a branch head "to" the trunk head This was
because I misunderstood the dialog - in point (4) above, the words
"from" and "to" as used have a totally different meaning to the meaning
they have in the second sentence (of point 4). If you thought the merge
dialog was talking about the same thing have another read of the docs.
The TSVN manuals describe this quite well but I think most people should
that page twice.


To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-01-28 19:59:32 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.