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].
Received on 2009-06-17 22:24:39 CEST