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

Re: tree conflict not justified while merging

From: Frédéric Ville <frederic.ville_at_gmail.com>
Date: Wed, 17 Jun 2009 14:01:03 -0700

Hi Stefan,

Thanks for your reply. It doesn't make sense to me either! I got a different
result than you but I don't know why.

Here are commands I typed step by step :

1. svnadmin create svn
2. svnserve -d
3. svn mkdir svn://xxx/svn/trunk -m 'trunk..'
4. svn mkdir svn://xxx/svn/branches -m 'branches..'
5. svn co svn://xxx/svn/trunk
6. cd trunk
7. ls /tmp/* > file1
8. svn add file1
9. svn commit file1 -m 'file1..'
10. svn copy svn://xxx/svn/trunk svn://xxx/svn/branches/1.0 -m 'branch 1.0'
11. ls > file2
12. svn add file2
13. svn commit file2 -m 'file2..'
14. cd ..
15. svn co svn://mscidapp1/tmp/svn/svn/branches/1.0
16. cd 1.0
17. svn merge ^/trunk --dry-run

--- Merging r2 through r5 into '.':
   C file1
A files2
Summary of conflicts:
  Tree conflicts: 1

Here is the svn version I use:

$ svn --version
svn, version 1.6.1 (r37116)
   compiled Apr 13 2009, 16:35:55

Thanks
Frederic

2009/6/17 Stefan Sperling <stsp_at_elego.de>

> On Wed, Jun 17, 2009 at 12:06:24PM -0700, Frédéric Ville wrote:
> > 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'
>
> If you created the branch in r4, why is the merge later from
> trunk to the branch merging r2 through r5? That doesn't make sense...
>
> > 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
>
> Following your instructions, at this step, I don't get the
> conflict. And the branch only tries to pick up r4 and r5,
> which is what I'd expect:
>
> $ svn merge --dry-run ^/trunk
> --- Merging r4 through r5 into '.':
> A file2
>
> So you must be doing something else that you haven't mentioned
> yet. What could it be?
>
> Thanks,
> Stefan
>
> > 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].
>

-- 
Frederic Ville
142 Lakeshore Ct
Richmond CA - 94804
United States
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2362982
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-17 23:15:47 CEST

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