Informe sobre herramienta Subversion

!
%))&
"
# $%&'(&
,.
0
2
.
$+
%+
'+
/+
3+
&+
(+
4+
2
* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ '
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ '
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ /
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ /
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ /
*
1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ /
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ /
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ (
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ (
.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4
.
5
6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ $)
.
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ $$
7
8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ $%
.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ $'
.
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ $/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ $&
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ $&
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ $9
%
Introducción
:
+0
6
-
1
+0
8
;
1
1
<
+
6
-
+0
1
;
*
8
-
*
>
=
+
1
*+
6
Arquitectura de subversion
-
:
=
>
=
+
?
-
8
=
-
1
=
-
+
'
Clientes
0<
1
=
5
8 5
@
5
7AB+
Formas de acceso al repositorio
0
+
$+ ,
"
-
-
5=
8
5 5
5
-
+
%+ ,
"
,
1
8
1+ 0
8
=
'+ ,
0
+
;
+
Estructuras de repositorio
0<
$+ 2 C
0
+
2
-
*
8
+
%+
?
1
< -
6
=
5
8
-
*
+?
D
6 2 C +
*+
5
Instalación de la herramienta
B+ 0
=
F=A
,
6E
," @, 1 "
=? <=2 =
+
*
-
8
5 1
*
1
+
Binarios
/
$+ 2 6
*
1
+
+
+
E
,
1
?
;
1+ "
1
0
1
GG1
8*
1
1
1+ G
* %+)+39+
+
+
6
*
+
+"
+
0
*
+
0
1
6
GG
+
+
G+
*
* $+'+%+
8*
+ .
+
.
*
-
*
*
5
=5
8
+
8 5
+
7A
0
6
1
* $+'+3+&4)/+
8 5
GG
5
*
+
G
+
8*
Servidor
%+ .
+
*
5
-
-
8
+
+
0
-
5
5-
0
-
8
+
* -
5
+
+
0
5
*
+ .
0<
0
-
8
H "=
, 1+ "
5
+
-
+
+
+
,
0
3
5-
=
=
5
>
<
6
+
"
5+
+
,
0
-
*
'&9)=
8
+
"
6
E
1
6
GG C+
* +0
+ CG
I
G
6
*
G
+
$+
"
1
+ <
*
+?
6
::
:
J K
-
L
-
::
J+
+
%+
"
6
#
+
,
1
;
1 =
$+
1
+
1
@-
*
L
L
B
*
L 18L
+
1+ 0
+ +
1
%+
0
* 1
+
1 <
=
5
*
1
?
+
'+
LoadModule dav_module modules/mod_dav.so
LoadModule dav_svn_module modules/mod_dav_svn.so
LoadModule authz_svn_module modules/mod_authz_svn.so
;
1
+
<Location /svn>
DAV svn
SVNPath "D:\mi_repositorio"
</Location>
&
Cliente
'+ .
+
*
+
* @.
0
B
M N+ 0
*
7A @.
+
5
8 5
0<
B
8
1
5
8 5
6
8
+ .
8
+
1
GG
*+
+
+?
+
G
*
8-
-
=
+
-
6
8 +
-
?-
0<
+
?
0
58
G
GG
+
+
;
1
0
?
8
+
GG@
1 GG 1
SVN
0<
;
1
*
?B+
8
;
?+
svn:// y svn+ssh://(con tunneling de SSH)+
Operaciones
,
1
*
5
5
+
$+
0
*
1
8 =
-
+
%+
81 C
5
* - 8
+
6
*
8
-
5
'+
.
8
*
+
/+
8
<
(
+0
8
-
5
6
+
3+
1
*
>-
+
&+
0<
-
+
(+
8 *
>
+ 0<
*
8
+
1. Creando el repositorio
*
1
-
+
.
6
6
L
+
svnadmin create --fs-type fsfs d:\mi_repositorio
L
*
1
*
+
1
=
4
*
6
+0
-
1
1
6
;
*+
* -
8-
1
- -
.
+0
5
-
6
=
1
::
,
-
J
8
*
*=
+
J.
GGG G L
5
+0
8
-
6
8
@1
B+
9
2. Creando el área de trabajo
05
6
1
5
8
;
+
svn checkout file:///d:/mi_repositorio
8-
5
;
,
.
+
6
,
8
6=
8
1
=
+
*
8
<
*
1
1
=
+
!
Index: src/main/Calculator.java
=========================================================
--- src/main/Calculator.java
(revisión: 1)
+++ src/main/Calculator.java
(copia de trabajo)
@@ -10,4 +10,8 @@
return (x - y);
}
+
+
+
+
public int multiple(int x, int y){
return (x * y);
}
}
$)
,
8
*
#
.
5
O+
*
6=
+
O
-
-
3. Comitear los cambios
8-
8
5
6
1
+0
-
*
6
>
+
0
.
6
+
*
*
svn commit --message "Nueva operación de multiplicación"
$$
.
8*
8
+
4. Visualizando los logs
0
-
8
*
+
*=
=
1
6
+
+
D:\proyecto\src\main>svn log Calculator.java
-----------------------------------------------------------------------r2 | Juan Pablo | 2006-07-20 10:17:39 -0300 (jue, 20 jul 2006) | 1 line
Nueva operación de multiplicación
-----------------------------------------------------------------------r1 | Juan Pablo | 2006-07-19 10:21:01 -0300 (mié, 19 jul 2006) | 1 line
Importación inicial
$%
- 1
+.
8
+
5. Creando un tag
*
1
8
<
=
;
+
"
" #0
"$ 0
%
?
"
5
5
+
+
5
*
::
GGG G L
-
*
J7
G
+
8
-
* $+)
G
* 1 *
J
L$L)G
GGG G L
G
+
CG
$'
6. Creando una rama
1
8
+"
+0
+0
,
8
8
1
8
1
1 +
1
-
-
-
-
*+
svn copy --message "Rama con nuevas operaciones"
file:///d:/mi_repositorio/trunk/
file:///d:/mi_repositorio/branches/rama_nuevas_operaciones
$/
&
88
+"
1+
6
1
GGG G L
-
*
G
,1
6
1 G
L
1
*
@6
.
L
CB+ ,
*
*
+
$3
7. Unir ramas
.
<
=
1
+H
@
-
.
5
=
* B+
*
*
@B
*=
-
*
+"
8
5
1
7
@
CB
=
=@
1B
+
5=-
5
+
"
8
8
5
*
=
+
8. Resolviendo conflictos
0
5
"
@
?
;
5
6
5
5
* .
1
@B
+
5
*
+
6
6
5
5
*
6+ "
1
B+
6.
@B
P
$&
J.
8
JQ
R
?
@
*
B+
?
;
1
+
@B
5
6
=
@B
P
J.
8
JQ
R
.
A
8
*
"
.
1
* 5
+
6= *
6=1
8
5
0
*
1
1
*
8
8*
+
+
1 +
@B
P
SSSSSSS +
J.
5
JQ
TTTTTTT
J.
8
JQ
UUUUUUU + $'
R
$(
0
1
<
*
8
5
6+
@B
P
J.
5
JQ
R
?
1
*
$%
$'=
+
.
8
8
+
*
8
+"
>
8
*
+
$4
Bibliografía
1
1
GG
L
, 1
+
L
LE
1
GG<
+
+
GG C
+
G
<
G
1
G 1 G%))3G)3G'$G$)/4+
G 1 G%))&G
)$G$&G
+
G
<
L LL
1G 1 G%))&G)&G$/G4$9)3+
<
$9