**Ìܼ¡ [#yb30579d]
#contents
** subversion¤ò»È¤Ã¤Æ¤ß¤ë [#m51b678b]
|¥«¥Æ¥´¥ê¡¼|subversion¤ò»È¤Ã¤Æ¤ß¤ë|
|Í¥Àè½ç°Ì|»êµÞ|
|¥¤¥Æ¥ì¡¼¥·¥ç¥ó|[[¥¤¥Æ¥ì¡¼¥·¥ç¥ó1]]|
|¾õÂÖ|´°Î»|
|´°Î»Í½ÄêÆü||
|¹©¿ô||
|Âбþ¼Ô|À¶¸¶|
----
**Îý½¬ [#n138ef93]
***¥ê¥Ý¥¸¥È¥ê¤Î½é´ü²½ [#v4fc162e]
-¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¡§home/staff/kiyohara/subversion/
-$svnadmin create ./subversion
***¥â¥¸¥å¡¼¥ë¤ò¥ê¥Ý¥¸¥È¥ê¤Ë¥¤¥ó¥Ý¡¼¥È [#xacc1d06]
$svn import -m "New import" ./public_html/training/borad/ file:///home/staff/kiyohara/subversion/
***¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤Æºî¶È³«»Ï [#b59ba8fe]
$svn checkout file:///home/staff/kiyohara/subversion/ board
A board/board2.php
A board/InputFunc.php
A board/BoardClass.php
A board/regist.php
A board/BoardClass2.php
A board/board.php
A board/login.php
Checked out revision 1.
***Êѹ¹¤ò²Ã¤¨º¹Ê¬³Îǧ [#q24e0933]
$svn diff
Index: board2.php
===================================================================
--- board2.php (revision 1)
+++ board2.php (working copy)
@@ -21,7 +21,7 @@
}else{
$smarty->assign('mod',1);
}
-
+//Êѹ¹
$smarty->assign('Array',$Array);
$smarty->assign('page',$board->getPageNo());
if((isset($_POST['check']))){
@@ -32,6 +32,5 @@
$smarty->assign('err_msg','ÆâÍƤÏɬ¿Ü¤Ç¤¹¡£<br>');
}
}
-$smarty->display('board2.tpl');
-
+$smarty->display('board2.tpl');
?>
Index: InputFunc.php
===================================================================
--- InputFunc.php (revision 1)
+++ InputFunc.php (working copy)
@@ -26,6 +26,7 @@
$this->db->execute($query,array($acnt,$pass));
return true;
}else{
+//ÄɲÃ
return false;
}
}
***¥ê¥Ý¥¸¥È¥ê¤ØÈ¿±Ç [#e49e2906]
$svn commit -m "Add"
Sending InputFunc.php
Transmitting file data .
Committed revision 3.
***¥ê¥Ý¥¸¥È¥ê¤Î¥¢¥Ã¥×¥Ç¡¼¥È [#t9bfebcd]
$svn update
At revision 3.
***¿·µ¬¥Õ¥¡¥¤¥ë¤òºîÀ®¤·Äɲà [#d53a2e8a]
$echo swedrfgtyhuji > test.txt
$cat test.txt
swedrfgtyhuji
$svn add test.txt
A test.txt
***¿·µ¬¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤·Äɲà [#gcfcb43c]
$mkdir abcd
$svn add abcd
-svn mkdir¤Ç¤â½ÐÍè¤ë
--svn mkdir¤Ç¤â½ÐÍè¤ë
***¥ê¥Ý¥¸¥È¥ê¤ØÈ¿±Ç [#ba30bc41]
$svn commit -m "Add Hello.php source file"
Adding abcd
Adding abcd/Hello.php
Adding test.txt
Transmitting file data ..
Committed revision 4.
***¾õÂÖ³Îǧ [#t3819938]
$svn status
M BoardClass.php
$echo testetesttesttest > test.test
$svn status
? test.test
M BoardClass.php
$svn add test.test
A test.test
$svn status
M BoardClass.php
A test.test
$svn commit -m "test"
Sending BoardClass.php
Adding test.test
Transmitting file data ..
Committed revision 5.
***.svn¥Ç¥£¥ì¥¯¥È¥ê¤Ê¤·¤Ç¥ê¥Ý¥¸¥È¥ê¤«¤é¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤¹ [#q8bba81f]
$ svn export file:///home/staff/kiyohara/subversion/ board
A board
A board/board2.php
A board/InputFunc.php
A board/BoardClass.php
A board/regist.php
A board/BoardClass2.php
A board/abcd
A board/abcd/Hello.php
A board/board.php
A board/test.test
A board/test.txt
A board/login.php
Exported revision 5.
***svn cat [#m2f16b52]
$svn cat ./abcd/Hello.php
<?php
echo Hell;
?>