[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: Ashish Jindal <jindal.ashish_at_gmail.com>
Date: 2006-04-29 19:14:39 CEST

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

On 4/28/06, Tobias Schäfer <tobiasschaefer@gmx.de> wrote:
>
> On Thursday 27 April 2006 05:09, Ashish Jindal wrote:
> > Hi,
> >
> > Firstly, sorry for cross posting. I am first looking the command line
> > argument and then also looking how it can be done thru TortoiseSVN.
> >
> > I have a typical scenario:
> >
> > 1. Original code at /project/trunk/File.txt
> > 2. Branched code at /branches/br01/File.txt
> > 3. I make changes in both the main line and also in the branched line
> > (/project and /branches).
> > Assume that I make changes at the same locations (line number 2, say
> > for example).
> > 4. Now, when I want to merge branch into the main line, there's
> obviously a
> > conflict. But I get none!
> > Also, while using Tortoise, the updates from branch overwrite the
> ones
> > in main line. How can I manually resolve these conflicts.
>
> This scenario should indeed cause a conflict which needs to be resolved
> manually. Since this generally works I propose that you describe *exactly*
> what you are doing so that others can try to reproduce your problem.
> If you manage to reproduce the error with the svn command line client then
> please post the steps to subversion mailing list instead of the
> tortoisesvn
> mailing list.
>
> Tobias
>
>
>
Received on Sat Apr 29 19:14:46 2006

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