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
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
TDAB 1
Creating the project for Trade Date Account Balance
Did I something wrong or is this a bug in Subversion?
Thanks
Linedata Services (UK) Ltd
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
|
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.