RE: Strange (or maybe not) result from merge trunk to branch [SOLVED]

[Giulio Troccoli <gi...@uk.linedata.com>]

> I am testing how to use the new merge-tracking feature after upgrading from 1.4.4 to 1.6.4.
> 
> The repository has been recreated after the upgrade of Subversion with a dump/load cycle (the dump was taken with 1.4.4).
> 
> I have create the branch with (in our case the trunk is called wip)
> 
> svn cp ^/wip ^/projects/tdab -m"Created new branch"
> 
> I made some changes into both the trunk and branch and committed them.
> 
> My branch is up-to-date, i.e. svn st doesn't return anything. When I try the merge I get the following
> 
> localhost src> svn merge --dry-run ^/wip
> --- Merging r2 through r3 into '.':
>    C src
> --- Merging r4 through r5 into '.':
>    C src
> --- Merging r6 through r12 into '.':
>    C src
> --- Merging r14 through r5844 into '.':
>    C src
> Summary of conflicts:
>   Tree conflicts: 4
> 
> I'm puzzled by why Subversin is trying to merge the revisions before the branch was created. It knows that the branch was a copy of wip at revision 5840 so why merging the revision before that?
> 
> localhost src> svn log -v --stop-on-copy
> ------------------------------------------------------------------------
> r5844 | gtroccol | 2009-08-21 06:39:31 -0400 (Fri, 21 Aug 2009) | 1 line
> Changed paths:
>    M /projects/TDAB/src/if/cp/ifcpco.c
>    M /projects/TDAB/src/md/da/mddamain.c
> 
> TDAB 1
> ------------------------------------------------------------------------
> r5841 | svn | 2009-08-20 12:31:22 -0400 (Thu, 20 Aug 2009) | 1 line
> Changed paths:
>    A /projects/TDAB (from /wip:5840)
> 
> Creating the project for Trade Date Account Balance
> ------------------------------------------------------------------------
> 
> Did I something wrong or is this a bug in Subversion?
> 
> Thanks
> Giulio

I have found out why the strange behaviour: it's becuase I'm stupid :-)

I was issuing the merge command from the src directory instead of tdab.
The structure of my repostiory is roughly like

- wip
  |-src
- projects
  |- tdab
     |- src

tdab has been created as a copy of wip, so there is where I must run the merge. Once I have done that everything is fine again.

Sorry for all the fuss.

Giulio

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].