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

Merging copy operations

From: Ulrich Eckhardt <ulrich.eckhardt_at_dominolaser.com>
Date: Thu, 4 Aug 2011 12:24:38 +0200

Hi!

I'm refactoring code and in that context I moved parts of one file to a
separate file, so I copied trunk/A to trunk/B and then hacked the two so that
each contained one part of the code. Then, when the whole works again, I
commit the whole in a commit. First question here: I consider that a normal
approach that should be supported, any objections here?

Then, lateron, I want to merge the changes. I then merge the revision from
trunk to the stable branch. What I noticed there is that in the branch, the
"copy from" property of the newly-created file "stable/B" points to "trunk/A",
while I would have expected it to point to "stable/A" instead! Second question
here: In what case does the existing behaviour make sense? I'd say that when
merging, such copy-from paths must also be translated to the new tree.
However, if the path was outside the "from" tree, it shouldn't be translated,
so there the current behaviour would be expected.

What I'm not sure is if this has an effect on mergeinfo, I haven't actually
tried that, so I'm guessing here. What I think is that if "trunk" at some
point acquired any mergeinfo, that mergeinfo implicitly applies to "trunk/B",
too. If I now copy that file to a branch, it will preserve that mergeinfo
(right?) so that now the file and the rest of the branch explicitly have
different mergeinfo properties. At least I believe this can happen, which
would be bad, because you typically want the mergeinfo to be restricted to the
root of the branch.

Is this a bug or am I doing something wrong?

Uli

-- 
ML: http://subversion.apache.org/docs/community-guide/mailing-lists.html
FAQ: http://subversion.apache.org/faq.html
Docs: http://svnbook.red-bean.com/
**************************************************************************************
Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Visit our website at http://www.dominolaser.com
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
Received on 2011-08-04 12:17:21 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.