{"id":430,"date":"2008-02-02T23:06:39","date_gmt":"2008-02-03T03:06:39","guid":{"rendered":"http:\/\/www.dr-chuck.com\/wordpress\/?p=430"},"modified":"2011-12-17T12:25:34","modified_gmt":"2011-12-17T16:25:34","slug":"keeping-my-post-2-4-portal-branch-up-to-date","status":"publish","type":"post","link":"https:\/\/www.dr-chuck.com\/csev-blog\/2008\/02\/keeping-my-post-2-4-portal-branch-up-to-date\/","title":{"rendered":"Keeping my post-2.4 portal branch up to date"},"content":{"rendered":"<p>This is from Ian &#8211; I am sure that it will make more sense when the time comes for me to use it :)<br \/>\nhttps:\/\/source.sakaiproject.org\/svn\/portal\/branches\/post-2-4<br \/>\nWhen you want to merge from trunk into a working copy of the branch.  do&#8230;<br \/>\nto get the copy point do<br \/>\nsvn log &#8211;stop-on-copy https:\/\/source.sakaiproject.org\/svn\/portal\/branches\/post-2-4<br \/>\nthen merge will be<br \/>\nsvn merge -rxxx:HEAD https:\/\/source.sakaiproject.org\/svn\/portal\/trunk .<br \/>\nwhere xxx is the last copy point revision<br \/>\ninto the working directory, followed by a commit.<\/p>\n","protected":false},"excerpt":{"rendered":"<p>This is from Ian &#8211; I am sure that it will make more sense when the time comes for me to use it :) https:\/\/source.sakaiproject.org\/svn\/portal\/branches\/post-2-4 When you want to merge from trunk into a working copy of the branch. do&#8230; to get the copy point do svn log &#8211;stop-on-copy https:\/\/source.sakaiproject.org\/svn\/portal\/branches\/post-2-4 then merge will be svn [&hellip;]<\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-430","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"_links":{"self":[{"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/posts\/430","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/comments?post=430"}],"version-history":[{"count":1,"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/posts\/430\/revisions"}],"predecessor-version":[{"id":2537,"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/posts\/430\/revisions\/2537"}],"wp:attachment":[{"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/media?parent=430"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/categories?post=430"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.dr-chuck.com\/csev-blog\/wp-json\/wp\/v2\/tags?post=430"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}