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

Strange (or maybe not) result from merge trunk to branch

From: Giulio Troccoli <giulio.troccoli_at_uk.linedata.com>
Date: Fri, 21 Aug 2009 10:30:54 +0100

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

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?


Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-08-21 11:31:58 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.