svkの使い方

• http://d.hatena.ne.jp/ktat/20060917 Part I
• http://d.hatena.ne.jp/ktat/20060922 Part II
• http://d.hatena.ne.jp/ktat/20060925 Part III

original

• http://www.bieberlabs.com/wordpress/archives/2004/11/30/using-svk
• http://www.bieberlabs.com/wordpress/archives/2004/12/31/svk-distributed-version-control-part-iii

part I

• 個人用のrepositryを使って再挑戦してみよう．

% svk -v →installはすでに済んでいる．
This is svk, version 1.08.
% svk mirror //mirror/eto svn+ssh://eto@eto.com/home/eto/svn →ミラーを作成．
Committed revision 56.

% svk mirror --list →リストをとる
//mirror/eto            svn+ssh://eto@eto.com/home/eto/svn
//mirror/yp             svn+ssh://eto@eto.com/repos/yp

% svk sync //mirror/eto →syncする
Syncing svn+ssh://eto@eto.com/home/eto/svn
Retrieving log information from 1 to 26
Committed revision 57 from revision 1.
<中略>
Committed revision 82 from revision 26.

% svk cp -m "create." //mirror/eto //eto →コピーを作る
Committed revision 83.

% cd
% svk co //eto
Syncing //eto(/eto) in /home/eto/eto to 83.
A   eto/paper

• 準備できた．

part II

• 別のところでcommitする．

% cd ~/svn/paper
% scom
Sending        paper/0704-hci123/memo.txt
Transmitting file data .
Committed revision 27.

• svkの方でupdateする．

% svk sync //mirror/eto
Syncing svn+ssh://eto@eto.com/home/eto/svn
Retrieving log information from 27 to 27
Committed revision 84 from revision 27.

% svk smerge -C //mirror/eto //eto →dry-runする
Auto-merging (82, 84) /mirror/eto to /eto (base /mirror/eto:82).
U   paper/0704-hci123/memo.txt
New merge ticket: 36ddd1d3-4b30-4bb9-bb59-d65c5dbeb768:/:27

% svk smerge -l //mirror/eto //eto
/tmp/svk-commitVeCE0.tmp: 6 lines, 143 characters
U   paper/0704-hci123/memo.txt
New merge ticket: 36ddd1d3-4b30-4bb9-bb59-d65c5dbeb768:/:27
Committed revision 85.

% cd ~/eto
% svk up
Syncing //eto(/eto) in /home/eto/eto to 85.
U   paper/0704-hci123/memo.txt

• updateされました．

part III

% svk sync //mirror/eto
Syncing svn+ssh://eto@eto.com/home/eto/svn

% cd ~/eto
% svk diff
% svk commit
% svk smerge -C //eto //mirror/eto →逆方向にmergeかける
Auto-merging (0, 86) /eto to /mirror/eto (base /mirror/eto:84).
Checking locally against mirror source svn+ssh://eto@eto.com/home/eto/svn.
U   paper/0704-hci123/Makefile
New merge ticket: ca3c6b9e-9783-443b-b94c-994f84493b42:/eto:86

% svk smerge -l //eto //mirror/eto
/tmp/svk-commitQtZwh.tmp: 8 lines, 197 characters
Merging back to mirror source svn+ssh://eto@eto.com/home/eto/svn.
U   paper/0704-hci123/Makefile
New merge ticket: ca3c6b9e-9783-443b-b94c-994f84493b42:/eto:86
Merge back committed as revision 28.
Syncing svn+ssh://eto@eto.com/home/eto/svn
Retrieving log information from 28 to 28
Committed revision 87 from revision 28.

失敗

• svk commitをするのを忘れていた．

% svk smerge -C //eto //mirror/eto →逆方向にmergeかける
Auto-merging (0, 85) /eto to /mirror/eto (base /mirror/eto:84).
Checking locally against mirror source svn+ssh://eto@eto.com/home/eto/svn.
Empty merge.

% svk smerge -l //eto //mirror/eto
/tmp/svk-commitNQL5b.tmp: 6 lines, 142 characters
Merging back to mirror source svn+ssh://eto@eto.com/home/eto/svn.
Empty merge.

• うーむ，なんでだ?

% cd ~/eto/paper
% kcp 0704-hci123 0704-hi2007
% kpush

• いろいろ掃除する

% kcom
% kpush

• deldot.rbを更新してみる

% kdif
% kcom
% kpush

• というリズムでやればいいのかなー．

• svkを使うことにしたら、checkoutから含めて全部svk使うのがいい