On Friday 05 February 2010, Stefan Sperling wrote: [ Overview of SVN 1.7's 'patch' command ]
Stefan, thank you for that overview! I have a question that touches that topic and which I stumbled over sometime in the past about possible sources and targets of merge operations: 1. Source being a working copy with modifications. The idea is to use this to shelf some changes. I simply copy a few files with changes inside a working copy without committing them and then revert the changes on the original to first pursue another line of development. When I'm done, I'd like to merge the changes back into the "real" target files and revert the copy operation. edit x # start cool feature # ...oh wait, need something else first! svn copy x x.shelved svn revert x edit x # do something else svn commit x -m "something else" svn merge x.shelved x # *Fictional command!* svn revert x.shelved rm x.shelved edit x # continue cool feature Note: I'm aware that I could create a feature branch which ideally would be equivalent. However, that requires a connection to the repository (no offline work) with write access (think about non-core developers trying to manage patches) and adds noise to the commit logs (think about changes which for whatever reason you don't want to make public). Alternatively, I could use svk, but that again is some software I have to install first. 2. Target being a non-working copy. I don't remember where I wanted to use this one, I believe I wanted to apply changes I made to an SVN vendor branch to a (non-versioned) release of that vendor or to some code in a completely different VCS. 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 ************************************************************************************** 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. **************************************************************************************
