informatica:linux:subversion
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
informatica:linux:subversion [2010/12/23 16:43] – 127.0.0.1 | informatica:linux:subversion [2015/04/13 20:19] (current) – external edit 127.0.0.1 | ||
---|---|---|---|
Line 109: | Line 109: | ||
===== Subversion y apache ===== | ===== Subversion y apache ===== | ||
+ | |||
+ | ==== Apache >=2.4.x y subversion >=1.8.x ==== | ||
+ | |||
+ | http:// | ||
+ | |||
+ | 1. Instalar paquetes | ||
+ | |||
+ | sudo aptitude update; sudo aptitude install apache2 subversion libapache2-svn | ||
+ | |||
+ | 2. Habilitar módulo de apache: | ||
+ | |||
+ | < | ||
+ | sudo a2enmod dav | ||
+ | sudo a2enmod dav_lock | ||
+ | sudo a2enmod dav_fs | ||
+ | </ | ||
+ | |||
+ | 3. Reiniciar apache | ||
+ | |||
+ | sudo service apache2 restart | ||
+ | |||
+ | 4. Crear una config de apache: | ||
+ | |||
+ | sudo vim / | ||
+ | | ||
+ | Con el siguiente contenido: | ||
+ | |||
+ | < | ||
+ | < | ||
+ | DAV svn | ||
+ | # Automatically map any "/ | ||
+ | SVNParentPath /var/svn | ||
+ | </ | ||
+ | </ | ||
+ | |||
+ | 5. Ajustar permisos: | ||
+ | |||
+ | sudo chown -R www-data: | ||
+ | | ||
+ | 6. Cargar config de apache: | ||
+ | |||
+ | sudo a2enconf svn | ||
+ | sudo service apache2 reload | ||
+ | | ||
+ | 7. Probar: | ||
+ | |||
+ | http:// | ||
+ | |||
+ | Deberia ir a: | ||
+ | |||
+ | / | ||
+ | |||
+ | | ||
+ | |||
+ | |||
+ | ==== Apache <=2.2.x y subversion <=1.7.x ==== | ||
+ | |||
http:// | http:// | ||
Line 178: | Line 235: | ||
svn checkout http:// | svn checkout http:// | ||
+ | |||
+ | |||
Line 200: | Line 259: | ||
(Si no existe un fichero de contraseñas de apache) | (Si no existe un fichero de contraseñas de apache) | ||
- | | + | |
(Si ya existe) | (Si ya existe) | ||
- | | + | |
2. Teclear 2 veces la contraseña | 2. Teclear 2 veces la contraseña | ||
Line 242: | Line 301: | ||
(Si no existe un fichero de contraseñas de apache) | (Si no existe un fichero de contraseñas de apache) | ||
- | | + | |
- | | + | |
(Si ya existe) | (Si ya existe) | ||
- | | + | |
- | | + | |
2. Editar: | 2. Editar: | ||
- | | + | |
| | ||
Y dejarlo tal que así: | Y dejarlo tal que así: | ||
Line 278: | Line 338: | ||
4. Crear el archivo de reglas: | 4. Crear el archivo de reglas: | ||
- | | + | |
Con el siguiente contenido: | Con el siguiente contenido: | ||
Line 419: | Line 479: | ||
svnserve -d --config-file=/ | svnserve -d --config-file=/ | ||
+ | |||
===== Acceder a repositorio vía svn+ssh ===== | ===== Acceder a repositorio vía svn+ssh ===== | ||
Line 424: | Line 485: | ||
No requiere tener levantado svnserve. Basta con: | No requiere tener levantado svnserve. Basta con: | ||
- | svn co --no-auth-cache | + | svn co --no-auth-cache svn+ssh://usuario@ip_servidor_subversion/ |
Donde '/ | Donde '/ | ||
Line 725: | Line 786: | ||
svn update http:// | svn update http:// | ||
+ | |||
===== Listar revisiones ====== | ===== Listar revisiones ====== | ||
Line 736: | Line 798: | ||
svn log | svn log | ||
+ | |||
+ | |||
+ | ===== Comprobar si existen versiones nuevas en el repositorio ====== | ||
+ | |||
+ | < | ||
+ | svn st -u --no-auth-cache --username=USER | ||
+ | Authentication realm: < | ||
+ | Password for ' | ||
+ | * | ||
+ | * | ||
+ | * file2.sh | ||
+ | * | ||
+ | Status against revision: 234242 | ||
+ | </ | ||
+ | |||
+ | * | ||
+ | |||
+ | ===== Merge inverso o revertir a una revision concreta ====== | ||
+ | |||
+ | * *PROBLEMA* queremos eliminar las ultimas x revisiones de un proyecto | ||
+ | |||
+ | 1. Listar las revisiones | ||
+ | |||
+ | |||
+ | < | ||
+ | cd / | ||
+ | |||
+ | svn log | ||
+ | |||
+ | ------------------------------------------------------------------------ | ||
+ | r1132 | root | 2012-06-18 15:45:06 +0200 (Mon, 18 Jun 2012) | 1 line | ||
+ | |||
+ | back without symlinks | ||
+ | ------------------------------------------------------------------------ | ||
+ | r1131 | usuario | 2012-06-18 15:07:16 +0200 (Mon, 18 Jun 2012) | 1 line | ||
+ | |||
+ | puppet symlinks sudo | ||
+ | ------------------------------------------------------------------------ | ||
+ | r1130 | usuario | 2012-06-18 15:05:41 +0200 (Mon, 18 Jun 2012) | 1 line | ||
+ | |||
+ | puppet symlinks ssh | ||
+ | ------------------------------------------------------------------------ | ||
+ | r1129 | usuario | 2012-06-18 15:04:50 +0200 (Mon, 18 Jun 2012) | 1 line | ||
+ | |||
+ | puppet symlinks module puppet cont and snmp | ||
+ | ------------------------------------------------------------------------ | ||
+ | r1128 | usuario | 2012-06-18 15:03:26 +0200 (Mon, 18 Jun 2012) | 1 line | ||
+ | |||
+ | puppet symlinks module puppet | ||
+ | ------------------------------------------------------------------------ | ||
+ | r1127 | usuario | 2012-06-18 14:58:34 +0200 (Mon, 18 Jun 2012) | 1 line | ||
+ | |||
+ | puppet symlinks module ntp | ||
+ | ------------------------------------------------------------------------ | ||
+ | r1126 | usuario | 2012-06-18 14:52:25 +0200 (Mon, 18 Jun 2012) | 1 line | ||
+ | |||
+ | puppet symlinks module nfs | ||
+ | ------------------------------------------------------------------------ | ||
+ | r1125 | usuario | 2012-06-18 14:46:01 +0200 (Mon, 18 Jun 2012) | 1 line | ||
+ | |||
+ | puppet symlinks module apt | ||
+ | ------------------------------------------------------------------------ | ||
+ | r1124 | usuario | 2012-06-18 14:42:23 +0200 (Mon, 18 Jun 2012) | 1 line | ||
+ | |||
+ | puppet symlinks test 3 | ||
+ | ------------------------------------------------------------------------ | ||
+ | r1123 | usuario | 2012-06-18 14:40:23 +0200 (Mon, 18 Jun 2012) | 1 line | ||
+ | |||
+ | puppet symlinks test 2 | ||
+ | ------------------------------------------------------------------------ | ||
+ | r1122 | usuario | 2012-06-18 14:38:53 +0200 (Mon, 18 Jun 2012) | 1 line | ||
+ | |||
+ | test symlinks puppet | ||
+ | ------------------------------------------------------------------------ | ||
+ | r1121 | root | 2012-06-18 14:25:24 +0200 (Mon, 18 Jun 2012) | 1 line | ||
+ | |||
+ | Initial feed | ||
+ | ------------------------------------------------------------------------ | ||
+ | </ | ||
+ | |||
+ | 2. Queremos volver a la version inicial (r1121): | ||
+ | |||
+ | sudo svn merge -r1132:1120 . | ||
+ | |||
+ | 3. Hacemos el commit: | ||
+ | |||
+ | svn commit -m ' | ||
+ | |||
+ | ===== Copiar directorio evitando .svn ====== | ||
+ | |||
+ | sudo rsync -r --exclude=.svn / | ||
informatica/linux/subversion.1293122594.txt.gz · Last modified: 2015/04/13 20:19 (external edit)