Supongamos que se sigue trabajando en el tronco:
casiano@exthost:~/src/subversion/ejemplo$ vi lib/SVN/Example.pm casiano@exthost:~/src/subversion/ejemplo$ svn commit -m 'some bug fixed' Sending lib/SVN/Example.pm Transmitting file data . Committed revision 11.Estos fueron los cambios realizados:
casiano@exthost:~/src/subversion/ejemplo$ svn diff lib/SVN/Example.pm -r PREV
Index: lib/SVN/Example.pm
===================================================================
--- lib/SVN/Example.pm (revision 10)
+++ lib/SVN/Example.pm (working copy)
@@ -37,6 +37,7 @@
}
sub new_functionality3 {
+ # some bug fixed here
}
1;
Podemos incorporar los cambios realizados en el tronco a la rama
casiano@exthost:~/src/subversion/TRY-MGM-cache-pages$ svn merge -r10:11 svn+ssh://banot/home/casiano/repository/ejemplo/trunk/ --- Merging r11 into '.': U lib/SVN/Example.pm casiano@exthost:~/src/subversion/TRY-MGM-cache-pages$ svn commit Sending lib/SVN/Example.pm Transmitting file data . Committed revision 13.
Casiano Rodríguez León
