https://wiki.blender.jp/index.php?action=history&feed=atom&title=%E5%88%A9%E7%94%A8%E8%80%85%3AKazanbas%2Fsvn_tips利用者:Kazanbas/svn tips - 版の履歴2026-07-09T09:48:27Zこのウィキのこのページに関する変更履歴MediaWiki 1.31.0https://wiki.blender.jp/index.php?title=%E5%88%A9%E7%94%A8%E8%80%85:Kazanbas/svn_tips&diff=88231&oldid=prevYamyam: 1版 をインポートしました2018-06-28T18:41:49Z<p>1版 をインポートしました</p>
<table class="diff diff-contentalign-left" data-mw="interface">
<tr class="diff-title" lang="ja">
<td colspan="1" style="background-color: #fff; color: #222; text-align: center;">← 古い版</td>
<td colspan="1" style="background-color: #fff; color: #222; text-align: center;">2018年6月28日 (木) 18:41時点における版</td>
</tr><tr><td colspan="2" class="diff-notice" lang="ja"><div class="mw-diff-empty">(相違点なし)</div>
</td></tr></table>Yamyamhttps://wiki.blender.jp/index.php?title=%E5%88%A9%E7%94%A8%E8%80%85:Kazanbas/svn_tips&diff=88230&oldid=prev2009年5月25日 (月) 05:48にwiki>Chingachgookによる2009-05-25T05:48:31Z<p></p>
<p><b>新規ページ</b></p><div>=svn tips=<br />
This document can be useful for GSoC students and coders who'd like to refresh their memory on topics beyond svn basics.<br />
<br />
==Getting info==<br />
What rev is my current working copy?<br />
<pre><br />
svn info<br />
</pre><br />
Since BASE is the keyword for working copy rev, this is equivalent:<br />
<pre><br />
svn info -r BASE<br />
</pre><br />
What rev is the repository?<br />
<pre><br />
svn info [rep_URL]<br />
</pre><br />
<br />
==Merging with 2.5==<br />
Thanks to Jaguarandi for helping me to figure this out. Merging without specifying revisions is evil... Merge should be done like so:<br />
<pre><br />
svn merge -r [last_merge]:[current_rev] [2.5_URL]<br />
</pre><br />
replace [...] with your own values. If it's your first merge, then last_merge is the rev when your branch was created. Use `svn log` to find that. current_rev you can find with `svn info [2.5_URL]`. Be sure to note down current_rev, you'll use it on next merge as the value of last_merge.<br />
<br />
Also, if you're merging from the top `blender` directory in your working copy, then you should append `blender` to 2.5_URL, i.e. https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender<br />
<br />
==Undoing a commit==<br />
A commit can be undone with `svn merge`, e.g. the following, along with a subsequent `svn commit`, will rollback to oldrev:<br />
<pre><br />
svn merge -r [newrev]:[oldrev] [branch_URL]<br />
</pre><br />
or, if oldrev is just before newrev:<br />
<pre><br />
svn merge -c [newrev] [branch_URL]<br />
</pre><br />
<br />
==URLs==<br />
*Blender 2.5: https://svn.blender.org/svnroot/bf-blender/branches/blender2.5<br />
*my branch: https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-kazanbas/<br />
<br />
==Docs==<br />
*[http://www.digilife.be/quickreferences/QRC/Subversion%20Quick%20Reference%20Card.pdf svn quick reference card]<br />
*[http://svnbook.red-bean.com/ svn book 1.5]</div>wiki>Chingachgook