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

RE: Confused about merging

From: Méresse Christophe <christophe.meresse_at_nagra.com>
Date: 2006-12-01 09:51:05 CET

> From: Tremal Naik [mailto:tremalnaik@gmail.com]
> Sent: jeudi, 30. novembre 2006 18:50
> To: users@subversion.tigris.org
> Subject: Confused about merging
[snip]
> 1- I selected the trunk as From:
> 2- I checked the "Use from" checkbox
> 3- I selected revision 40 and 41 as source and destination
> respectively
>
> But the merge didn't work, i mean that when I performed a diff, the
> differences shown where those between revs 40 and 41 of the trunk, not
> between the 40 of the trunk and the 41 of the foobranch. That led to a
> conflict on some files

That's the normal behavior, and that's exactly what is explained in the TortoiseSVN manual.
Why wouldn't you have some conflicts ?... You have probably modified same lines on the same files on the two branches, that's normal.

> To make it work I had to
>
> 1- select the trunk as From: with rev 40
> 2- select the foobranch as To: with rev 41

This merge has probably no real sense I think.

>
> The things worked but not so well (a couple of files where deleted and
> added again with identical copies)

Yes, it does not surprise me.

What do you want to do exactly ? I think you were doing the right thing with your first try (Merging to your branch what has been done on the trunk in revision 41).

Regards,
Christophe

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Dec 1 09:51:45 2006

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