On Monday 11 January 2010, Stein Somers wrote: > > I think SVN wants you to not copy the file/dir but instead to merge the > > revision where it was added to the branch. > > Interesting idea, but as far as I get it it seems a complicated process: > - In the WC's target directory, merge a part of the changeset that > created (or last moved) the wanted subdirectory. So now we're no longer > only merging root directories. > - Inside the new subdirectory, merge the rest of the history of the > source subdirectory.
Why only merge a part of the initial changeset? Did it contain multiple unrelated changes? If so, that's IMHO the first sin, one changeset should only contain one logical change, otherwise merging becomes a b1tch. > And why would SVN not like copies? Forget that I wrote "from another > branch", it happens inside a branch too (i.e. if the only active > mergeinfo is in a parent directory shared by source and target of the > copy). If you do a simple WC -> WC copy, you get no additional > mergeinfo. If you do a URL -> WC copy on the same paths and revisions, > you get explicit/excessive mergeinfo on top. I'm pretty sure that's a > bug. But never mind, I can elide it myself. We'll see in 1.7. Actually, if I merge a revision that only touches a subdir but don't target the root but the subdir instead, I also get explicit mergeinfo. If SVN was better, it would see that merging to the root would be the same and put the mergeinfo there. Alas, this feature is not implemented yet. However, I wouldn't call it a bug that SVN can't read my mind. And I'm sure some people would object when I merge to a subdir and suddenly SVN changes its parent's mergeinfo. Cheers! Uli -- ML: http://subversion.tigris.org/mailing-list-guidelines.html FAQ: http://subversion.tigris.org/faq.html Docs: http://svnbook.red-bean.com/ Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932 ************************************************************************************** Sator 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.satorlaser.de/> ************************************************************************************** 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. Sator Laser GmbH ist für diese Folgen nicht verantwortlich. **************************************************************************************
