[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: Peter McNab <mcnab_p_at_melbpc.org.au>
Date: 2006-04-30 04:08:24 CEST

Ashish Jindal wrote:
> On TortoiseSVN... this is what I am doing:
>
> 1. I have a repository in /svn/projects
> 2. I create a file /svn/projects/trunk/File.txt
>
> 3. I create a branch at /svn/branches/version-1.0/File.txt
>
> 4. I modify both the files (at trunk as well as branch)
>
> 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".
>
> 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"?
>
> -Ashish
>
>
>
Presumably you have committed the changes before attempting the merge.
Are you selecting a "range" from the Trunk which includes the revision
on Trunk before the change to Trunk was applied?
You may in fact need to specify the revision from which the branch was
created.

Peter

<snip>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Sun Apr 30 04:08:33 2006

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