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

Re: Branch, Merge, Conflict

From: Daniel Atallah <daniel.atallah_at_gmail.com>
Date: 2006-04-29 19:25:47 CEST

On 4/29/06, Ashish Jindal <jindal.ashish@gmail.com> wrote:
> 5. Now, I right click and go for merging ("Merge..." option). The from URL
> is "trunk/File.txt" and to URL "version-1.0/File.txt".

This is where the problem is, you need to choose a range of revisions
to merge. Assuming that you want to merge the changes in your trunk
into the version-1.0 branch:
      From URL: /svn/projects/trunk/File.txt
      From Revision: The revision of the "version-1.0" branch creation
      To URL: /svn/projects/trunk/File.txt
      To Revision: The revision of the last commit you want to merge.

The "to URL" doesn't refer to where the changes are to be merged into,
but to the end of the range of changes to merge.

>
> Changes in projects/File.txt
> - Line 10: "New content in Main"
>
> Changes in branches/File.txt
> - Line 10: "New content in branch".
>
> Tortoise merges without any complaint. It overwrites the file in "From
> URL" and the content from "To URL" is retained, i.e., I finally have the
> file with following content;
>
> - Line 10: "New content in branch".
>
> Is this expected behaviour? If so, how can tell the tortoiseCVS to ask to
> "manually resolve these conflicts"?

This is the expected behavior when no changes were actually merged.
Subversion *always* requires that you manually resolve conflicts, if
there had been a conflict, you would have had to resolve it.

-Daniel

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Sat Apr 29 19:25:53 2006

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