åå¿é²ãæ¸ãããï¼æªç¢ºèªã ç¾å¨ã®ä½æ¥ãªãã¸ããªã®å¤æ´ããã¹ã¦ã³ããããã¦ãã ããã§å¤±æãã¦ãå®å¿â¡ trunkã®å 容ãbranchã«merge 使¥ãªãã¸ããªãbranchã«å¤æ´ svn switch file:///home/sysdev/svn_repos/branches/branched_version svn infoã³ãã³ãã§ç¾å¨ã®ä½æ¥ãªãã¸ããªã®URLçã確èªãã¦ãããã¨ã branchã®éå§ç¹ã®ãªãã¸ã§ã³çªå·ãç¢ºèª svn log --stop-on-copy ä¸çªæå¾ã«åºåããããã°ã®ãªãã¸ã§ã³çªå·ãæ§ãã¦ããï¼ä»®ã«r411ã¨ããï¼ã trunkã®å 容ãbranchã«mergeï¼merge試è¡ï¼ svn merge --dry-run -r 411:HEAD file:///home/sysdev/svn_repos/trunk trunkã®r411ããææ°ã¾ã§ã®ã³ã
{{#tags}}- {{label}}
{{/tags}}