[Phonehome-commits] r59 - /

[pamadio at garage.maemo.org]

Author: pamadio
Date: 2008-10-18 18:35:37 +0300 (Sat, 18 Oct 2008)
New Revision: 59

Added:
   notes-svn.txt
Log:
adding notes about svn branch

Added: notes-svn.txt
===================================================================
--- notes-svn.txt	                        (rev 0)
+++ notes-svn.txt	2008-10-18 15:35:37 UTC (rev 59)
@@ -0,0 +1,110 @@
+Creating a branch:
+http://svnbook.red-bean.com/en/1.1/ch04s02.html#svn-ch-4-sect-2.1
+
+Merging from a branch:
+http://svnbook.red-bean.com/en/1.1/ch04s03.html
+
+
+______________________________________________
+
+Lets create a working branch for the server dir:
+
+svn copy  https://garage.maemo.org/svn/phonehome/trunk/server   \
+https://garage.maemo.org/svn/phonehome/branches/server-pamadio \
+-m "creating a personnal branch for server dir" 
+
+[sbox-CHINOOK_ARMEL: ~/dev/phonehome/branches/server-pamadio] > pwd
+/home/user/dev/phonehome/branches/server-pamadio
+
+From here "svn info" will give me some information about the commit in the branch:
+
+------------------------------------------------------------------------
+r50 | pamadio | 2008-10-18 16:47:25 +0200 (Sat, 18 Oct 2008) | 1 line
+
+adding a xmlrpc test_login function
+------------------------------------------------------------------------
+r49 | pamadio | 2008-10-18 16:44:54 +0200 (Sat, 18 Oct 2008) | 1 line
+
+adding img
+------------------------------------------------------------------------
+r48 | pamadio | 2008-10-18 16:37:50 +0200 (Sat, 18 Oct 2008) | 1 line
+
+inserting gps info works
+------------------------------------------------------------------------
+r47 | pamadio | 2008-10-18 15:57:59 +0200 (Sat, 18 Oct 2008) | 1 line
+
+typo
+------------------------------------------------------------------------
+r46 | pamadio | 2008-10-18 15:55:33 +0200 (Sat, 18 Oct 2008) | 1 line
+
+database use change
+------------------------------------------------------------------------
+r45 | pamadio | 2008-10-18 15:31:13 +0200 (Sat, 18 Oct 2008) | 1 line
+
+s/XMLRPC_USERNAME/XMLRPC_TABLET_ID/
+------------------------------------------------------------------------
+r44 | pamadio | 2008-10-18 15:19:02 +0200 (Sat, 18 Oct 2008) | 1 line
+
+missing ) in mysql_query
+------------------------------------------------------------------------
+r42 | pamadio | 2008-10-18 13:34:18 +0200 (Sat, 18 Oct 2008) | 2 lines
+
+creating a p
+ersonnal branch for server dir
+------------------------------------------------------------------------
+r40 | lauren | 2008-10-18 07:20:50 +0200 (Sat, 18 Oct 2008) | 2 lines
+
+fixed a few minor errors
+refining device management
+------------------------------------------------------------------------
+
+and so on untill the begining of the checkout.
+
+Here, we see that the branch occured at revision 42.
+
+Now, lets create a another temporary branch for the server dir:
+
+svn copy  https://garage.maemo.org/svn/phonehome/trunk/server   \
+https://garage.maemo.org/svn/phonehome/branches/server-tmp \
+-m "creating a tmp branch"
+
+After updating svn, i have the branch available.
+[sbox-CHINOOK_ARMEL: ~/dev/phonehome/branches/server-tmp] > pwd
+/home/user/dev/phonehome/branches/server-tmp
+
+Too see the patch that should be applyed to get the same changed as what occurs
+from r42 (the pamadio branch creation) to revision 44 (a missing ')' in a mysql_query sentence:
+
+svn diff -r42:44 https://garage.maemo.org/svn/phonehome/branches/server-pamadio
+
+To apply this patch on the current directory:
+
+[sbox-CHINOOK_ARMEL: ~/dev/phonehome/branches/server-tmp] > pwd
+/home/user/dev/phonehome/branches/server-tmp
+
+[sbox-CHINOOK_ARMEL: ~/dev/phonehome/branches/server-tmp] > svn merge -r42:44 https://garage.maemo.org/svn/phonehome/branches/server-pamadio
+
+To merge the rest of the changes:
+
+svn merge -r44:50  https://garage.maemo.org/svn/phonehome/branches/server-pamadio
+(then commit).
+
+To check the local tmp branch actually match the server-pamadio one:
+
+svn diff https://garage.maemo.org/svn/phonehome/branches/server-pamadio https://garage.maemo.org/svn/phonehome/branches/server-tmp    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+