{"id":375,"date":"2012-02-02T10:48:58","date_gmt":"2012-02-02T09:48:58","guid":{"rendered":"http:\/\/webpiraten.de\/?p=375"},"modified":"2012-02-02T10:51:07","modified_gmt":"2012-02-02T09:51:07","slug":"howto-copy-merge-svn-branch-trunk","status":"publish","type":"post","link":"https:\/\/webpiraten.de\/index.php\/versionierung\/howto-copy-merge-svn-branch-trunk\/","title":{"rendered":"howto copy merge svn branch trunk"},"content":{"rendered":"<p><strong>Branch erzeugen<\/strong><\/p>\n<pre class=\"brush: bash; title: ; notranslate\" title=\"\">\r\ndev@server:~\/project&gt; svn cp https:\/\/svn.example.com:88\/svn\/project\/trunk https:\/\/svn.example.com:88\/svn\/project\/branches\/&#x5B;BRANCH_NAME]\r\n<\/pre>\n<p><strong>Branch aktuell halten<\/strong><\/p>\n<p>Es sollte immer in kurzen Abst\u00e4nden der Trunk in den Branch \u00fcberf\u00fchrt werden, damit es bei sp\u00e4terem Zur\u00fcckf\u00fchren keine gr\u00f6\u00dferen Konflikte gibt. Mit <em>&#8211;dry-run<\/em> kann man vorher testen was bei <em>merge <\/em>passieren w\u00fcrde.<\/p>\n<pre class=\"brush: bash; title: ; notranslate\" title=\"\">\r\ndev@server:~\/project\/branches\/&#x5B;BRANCH_NAME]&gt; svn up\r\ndev@server:~\/project\/branches\/&#x5B;BRANCH_NAME]&gt; svn merge --dry-run https:\/\/svn.example.com:88\/svn\/project\/trunk\r\ndev@server:~\/project\/branches\/&#x5B;BRANCH_NAME]&gt; svn merge https:\/\/svn.example.com:88\/svn\/project\/trunk\r\n<\/pre>\n<p><strong>Branch in den Trunk zur\u00fcckf\u00fchren<\/strong><\/p>\n<p>Mit <em>&#8211;dry-run<\/em> kann man vorher testen was bei <em>merge &#8211;reintegrate<\/em> passieren w\u00fcrde.<\/p>\n<pre class=\"brush: bash; title: ; notranslate\" title=\"\">\r\ndev@server:~\/project\/trunk&gt; svn merge --dry-run --reintegrate https:\/\/svn.example.com:88\/svn\/project\/branches\/&#x5B;BRANCH_NAME]\r\ndev@server:~\/project\/trunk&gt; svn merge --reintegrate https:\/\/svn.example.com:88\/svn\/project\/branches\/&#x5B;BRANCH_NAME]\r\n<\/pre>\n","protected":false},"excerpt":{"rendered":"<p>Branch erzeugen dev@server:~\/project&gt; svn cp https:\/\/svn.example.com:88\/svn\/project\/trunk https:\/\/svn.example.com:88\/svn\/project\/branches\/&#x5B;BRANCH_NAME] Branch aktuell halten Es sollte immer in kurzen Abst\u00e4nden der Trunk in den Branch \u00fcberf\u00fchrt werden, damit es bei sp\u00e4terem Zur\u00fcckf\u00fchren keine gr\u00f6\u00dferen Konflikte gibt. Mit &#8211;dry-run kann man vorher testen was bei merge passieren w\u00fcrde. dev@server:~\/project\/branches\/&#x5B;BRANCH_NAME]&gt; svn up dev@server:~\/project\/branches\/&#x5B;BRANCH_NAME]&gt; svn merge &#8211;dry-run https:\/\/svn.example.com:88\/svn\/project\/trunk dev@server:~\/project\/branches\/&#x5B;BRANCH_NAME]&gt; svn merge https:\/\/svn.example.com:88\/svn\/project\/trunk [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[77,75,54,76,43,41],"tags":[306,191,307,304,639,305],"class_list":["post-375","post","type-post","status-publish","format-standard","hentry","category-deployment","category-linux","category-server","category-shell","category-svn","category-versionierung","tag-branch","tag-copy","tag-howto","tag-merge","tag-svn","tag-trunk"],"_links":{"self":[{"href":"https:\/\/webpiraten.de\/index.php\/wp-json\/wp\/v2\/posts\/375","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/webpiraten.de\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/webpiraten.de\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/webpiraten.de\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/webpiraten.de\/index.php\/wp-json\/wp\/v2\/comments?post=375"}],"version-history":[{"count":5,"href":"https:\/\/webpiraten.de\/index.php\/wp-json\/wp\/v2\/posts\/375\/revisions"}],"predecessor-version":[{"id":379,"href":"https:\/\/webpiraten.de\/index.php\/wp-json\/wp\/v2\/posts\/375\/revisions\/379"}],"wp:attachment":[{"href":"https:\/\/webpiraten.de\/index.php\/wp-json\/wp\/v2\/media?parent=375"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/webpiraten.de\/index.php\/wp-json\/wp\/v2\/categories?post=375"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/webpiraten.de\/index.php\/wp-json\/wp\/v2\/tags?post=375"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}