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

tree conflict not justified while merging

From: Frédéric Ville <frederic.ville_at_gmail.com>
Date: Wed, 17 Jun 2009 12:06:24 -0700

Hi,

I think there is something wrong with the new tree conflict feature when I
try to merge.

Here is the description of my simple test case:

1. I created a repository that contains the following structure:
+ trunk (revision 1)
+ branches (revision 2)

2. I added into the trunk the file 'file1' (revision 3)

3. I copied the trunk into a new branch '1.0' (revision 4)

svn cp ^/trunk ^/branches/1.0 -m '1.0 created from trunk'

4. I added into the trunk a new file 'file2' (revision 5)

5. I checked out the branch '1.0' and type the following command:

svn merge ^/trunk --dry-run

I got an unexpected conflict with 'file1' ...
--- Merging r2 through r5 into '.':
   C file1
A files2
Summary of conflicts:
  Tree conflicts: 1

Thanks for your help,
Frederic

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2362953

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-17 21:09:49 CEST

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