workshop git

gitdomingo, 28 de Março de 2010

Alcides Fonseca

alcidesfonseca.comArch&Dev Manager

domingo, 28 de Março de 2010

http://wiki.alcidesfonseca.com/workshops/git

resources


controlo de revisõesdistribuídocriado por Linus Torvaldssuporta grandes repositóriosopensource

git


rápidofunciona offlinebackups naturaisbranch&merging facilitadoextensible

vantagens


git é flexívelpermite elaborar workflowsaqui é apresentado o meu

disclaimer


só entra no mastercódigo compilável e testado

features e bugs feitos em branches

commits escritos profissionalmente e em inglês:“Added function to debug”“Refactored class Add User”“Fixed wrong-result bug in Test”

filosofia


HEAD 11a24182a158ce7803e46f036fe143b143345d41 Added docs for milestone 3562506eb47e7e509197f8ca1e43b04342a0b64a3 Accepts requests from web9a78ab83a3a99f716eebfbe665f9f45bc8c27f3a Requests are now inside HumanChannel0a5094b544e98ad7122fa6fb1ad3908d012b211e Chat windows larger4b90e990e81e79e2c23bae5717de62947cd59a56 Merge branch 'web'3b960f9ef17207e41b35499fb9f5a099016bb726 Webclient now works with jabber09f01cb59af255065a2238125333afc2f1a7c67f Corrected bug with ADIUM message parsing77c3301dfc3363105089fab4b72e85ce989559e5 Improved README6c5f988962b08414febd9a1f2783cc2fc4fae172 Moved JsonMessage to templates/JSONMessaged9b4efb089fdc38b1b6a8c592910e06b30ec280b Moved to MVC packagesd18d78cacfc4a496c9b1b8b599c591dad1d476c7 Added regular Put and Delete methods to RoutedServlet5f19844fbaee8fd0c5e60ccba69fc5a85cd03650 Create and Delete Users works7bef182c5b9190f646a386c340bdb452469865fd Small typo7cd9ea8fffb002832cfafd02e33f6542231daeac Now clears the field after changing passworddc3665c94b254df0ff4b00e2e7bf4df097a779ab Views for each method in accountsf6e959de86b104b3e57e3b7fbd3eb06a333acf3c Refactored POST, PUT and DELETE in JS.a4e8bef4e804cc97af5e2a02c407405af3009754 Moved to a full RESTful API using Rails Methodsa192d159f3a37abcbba60c905df934bbe93e5af4 LoadBalancerBean creates, updates and deletes usersa43ac3d07ac2a57d23651a088e26e5e2e482d502 GET accounts in Admin4285879dcaeab9ef60335eb7d8a545571bf6706f Clients working fine.79f74b3f9591c908e55c934fb6ea099f87a26321 Servers are shown with clientsa6969222ece47ea60d79e1bb7a19284f6d13e5ae Rearranged js folders7797a0265b888de7753ae352a900e6198ff1c316 Loads server info without sorting8bc4627fa266f4a6c0b563ef079c5790290279cf fixed network bug in AdminServlet6df4732c5f15c5ec116826cfab24191666f8bf6b Included livepipe tabs.0856faa3f141a3740c16451a62759c28ae6a0432 Admin interface skeleton1d71f91b18a6e5f48b26332106aa4fa352da76c0 Server's API done.cff22cca01d42abf6f0b481b2528893403fa3166 Implemented Watchdog to delete old clients.cf8ab079d347be2c124da849acc3bd79c3e051ae Merge branch 'web'445cb411572c2c93723f79dda4e2e6525527cd48 Fixed bug with wrong credentials2b7c671778f3a4f22bdee62c4b7d8a468086242e Fixed Prefix and getPath.0ea989176ed78177033aa828af1429f447307532 Refactored login in JS9b5beed4a19de887f1558cefa8f58887dea42db2 Renamed Root to ChatServletd3650537f118a78f1ba741663a5ed7f1662797ef Refactored RoutedServlet to outside of sd package.e6329f81b55b3105d5124a0335ef6b801bd845b4 Changed mimetype to jsona88e6001a6f752fdb9b72f8526ae41411f7769f6 removed dev.db from repo5adc508febdf4e91b55a64e54e707d20d46d02af removed dev.db from repo675ca38cf43fa85d73a79c67693f53ebc4d77690 Ignored dev database96c8b54a62656de71b3d5924f1919aac5fd943fb Fixed remove bug5291f951d600690d20c1390097841b061cd290d2 Improved Chat and renamed viewse8903d9dbf83454acb01806704ef385c4a1dfda3 Moved prototype and window to lib folder393856ba06323bda02d146e8de65d4c9265bea04 Corrigido Bug na consola7b62397d9f66c2c5dc73ca466799f6aebd20ca0c chat funcional com roster bonito3a7742589698ead3ae8f4d759c5d881205d71a05 Chat has roster with colorsbf3b6b6e1563d0536b25e3a463b1ec8f44f16ec6 Sending message as JSON but with two arraysf23abbf584dc1e995e6042528b9aab5165250325 Recebemos mensagens do client6c24fb83ddc0aac0d192eac3a4e2775e9339aae7 Json Object and switches to chata0b60be3f4b35a675b4e87925dc026b84826054e Added a Route system87c358a828718edf32c698618abfdd50ce8b70fd Removed a weird header tag in html50bf8a4791dae4b47f4a422ae6814408d13dbaaa Using Json Message5a9c39f99eefa5865d9c479669f7a420ccf00dee Renamed index from jsp to htmlcbe4fac3f0f843fdaee34cbf535738da755713e6 Removed old Comet stuff6464ac199bb3d928198b2aed2db40bb8a72c464f Login e Verifica mensagens1d808a173bb53710cf8062fc0fca171770be6504 Logins or noteeb822a9f6405ac930f6e5307589375a1718c9ac Removida tralha comet9b9abfb35967f6c3ace9268889dbd7204de391ed Adicionado package JSONacedbb7012c61c398f65230e7595e791c1f1500f Comet example almost workinga9e4aa558eab3fd30948d114f55c937bcc119e11 Imported hello that works with tomcatbeb0107f5007a906dec99fcf78ec985e5cc74294 Added doc2 and corrected dist in build.ant7fd648501d1a3cfd5db64fc2016f9c06d88a5f93 Moved messages to debug mode4f0c025708e7afb38b9e02f033ec103044ef6175 README actualizadobed58c987fa76970680d22c99f5bc18541bac983 Works in both jabber.org and locald3d28e7276a46521aeb35a3078a9e975420b9e65 Works with jabber.org0d88716fd6abbffa90d32e0c88a829fe25e09440 Added Server Console :)4308671fcbea494c0d3768b717f85d1fa052101f Improved exit command on NS6415e211e77f55a3e089ca2b154f0bbe0e82419a Console implemented in Naming Servicedd97e6b4015f78b976cc30e0d2805d0256478862 Refactored getLoadBalancer to Connector27c6c02356a472af2fc0374ccf3a9a7ac2f54743 Renamed READMEc051510ead9601a688c40dafa85ec459e7cb363f Fixed quit command, and retrying NSffe395d6edee4e28a2f3a5dcc1602f2c2bc5cab5 Clients connects to NS circularly too2bd9218c8d8e21dbe4653688c9c14f9f519c80b6 NS now goes circular4e722c8d2ee7597e8a2a9f06c2a7e7571a332d42 Now connects to following Naming Service16d743e562072d0e781d5677721a08ee81d4116c NS launches on the right port8c5a9dfebde9b0bfed036e7dee0aea28e55f0b6b Updated yet another Config magical number52151ee58ae26a7e0d879f5018b8d31cd23859c3 Moved NS retry time to Configff8d843947a1b2728884ed52a591526d456525f7 Improved readme5e72f42cbe4f1b1fd9a17e0c22a33cf4bbeba7fb Moved some stuff to Configd7bc830c97ca2ad2d9c3226cf0960a0065ecfb62 Fixed a few bugs in communication RMI36445f92e784932a13b463101ed12f469c3f689c Presence probing handled in the client side. XMPP non-compliant for the fist time :(fe765054bbf2e517539d4e1f2632a12e67ccf106 Corrigido bug do java.lang1f96be0510bc5ee0387530cec0a8bdc23e3c7da6 Socket Failure Handler improvements26fbd5bc71a83213b94d43bece8c558eb76d6197 Corrected load valuesc91a51683c1cdb1806e4ebe24e73b9695bcecca3 Failure of socket handledb1a7d952c9e2b69ad7ec9835d9c4d62b36fdfb1c s2s communication working. needs testing1cd7dce316a4215b8ce7b1d361594b660b88d740 Corrected Algorithmf9a4accedc83a6e69924242486c52675b6b7276b Changed Load Balancing Algorithm932ad45903c7c35be8a2f7156804f13ec6a7e558 Gets user and friends from NS. Problem with registry launch and doesn't have status.6f3fa23f0c8a0e86f91a90826d84c4689e269910 Implemented routing798273ad83d92d3988152abcc0af49f83f6c3432 Server detects when NS is downb3d11dc5a1c13fee4853d8a613c057722cc1d15e Server sends data through RMI (tested)73bef0b0adf86308d499fd7a0b0bb7fd9583e28d Correct stupid bug with commentfcf1c79766d32ceec3b36671e0f8094c6c189741 Dummy information added49db078c1a5e5d984e03f9299f939ab281554842 Server updates Server Load30e074f7f87a4f1013882c4605a55ee8e11d4403 Match instead of ifs in bootsc7ba1fbf1eb4b8b55a758312645cc48f4299908c Pinging and Updating servers41150db74c5db876e89b5b02aa0386851211d2e2 Removed Utils0998c42a352daf798374d05945c8a78a8f9a2bb1 Resolvido Bug Unicast. Agora já faz o join e pede1c6a952039522827f2eca7fc629bae27c5f4eb26 Added a NoServerAvailableException93494d43b479e0ef16e42bf09de67c16f9ef4875 Load Balancer replies the first, accepts keepalives and withdraws62ea659f49813bc96fb3fc1250505b14f5479e68 Client now finds host by Naming Servera4741437fe8b46a0ca0866744d83790214d8e04e Adicionados ficheiros do NS027c2151471144230431f9a64e2aefba6cb76f47 Refactored sd packages5bb1e762bf018b48b803692b834e3f7f923832dc Reformulado Boot do client16789e283dcc7a55be8ee59cc7ebddedb3b1796c Reformulado o build para a meta 2cfac1ab817330d281ef1a57ce53a5e1b198e74ab Documentation and Readme done2558ed73a55317fa2aafb71a2f42bd95bd78a72f Finishing stuff for release7e110e296a285c3cb0536b9d6232bd05de5f855d Removed prinln2c56f887adbb69b303a5ce6cad3bd124c37473fd PDF updatedb37e1b6401c317326c1003beabb5c731e2a94a62 Added Report with Introductione6d91434cbcda77ae14fdf5f6bd2ad42d2d474dc Changed to Debug=false317eb0d7140e5b6cd5ae7ce627498e9e62be909d Sends offline presence5f7ae183d55916cbf5eb00bbc00a4b96ab5d6554 Trying to implement offline presenceb96efc45b69cbed3ccc635dcbb3ba8b47570bfc1 Database corrected3eb2d67c0249cfda8c2f2ce4386ba8d72ad65b34 Two way subscription6a4e3c90226c834c4bf01249440e535534c88b44 Has requests lista54f24676b93c4b39e3406ef96f15ac4f17d03c7 Removed debug infod766fd57a692e0c2028d5c87c6f876d08c0c0888 Merge branch 'master' into f_client389af04161e314509fcaf2354bccf575bbd05f2c Removed debug messages85fb3aa7e59d776495732870a19909c2b3133f72 Resolved UDP issue216be80c75e6ce8de0273ea50a2170bb8be8cf39 Client working with presence support6cc78d4816c4e9fe7419a6f10d0915560ec32f10 Removed STDerr hider2f327b0a1c8ad4eb6eacf1013fa78fe4583d431d Added XML validator :)f1d8dce4df7d7a335f659a69d6b4228e23b07d42 Cliente a ligar, mas parece ter bugs23f54be31f024b2b7b664e097db95375cfb2470d UDP Server a funcionar75152b0a3a7c3816843f20f25454262449f479d6 Removed all Java files written by me :)37cf61ec22b7a5bf687656f575df1073faf678e5 Corrected Bug in Client and Refactored Client0683107db7a2332b0b29448722de9ee3eb713341 Servidor NIO a funcionar2b5ea3edcae9e5139297f176b18321bc4e90eea4 Beginning of the NIO server4b906f7fe7c1dd6e78681d6cf2ad36ce8cab78fe Probing and stuff...a7ceff4ff75fa01a940930b62ccf02a168916a11 Broadcasts or Redirects Presences77dcfadd0ac051c29d6bc8ce9c67d8dc030f604c Refactored with exists5f148989904626d90e67d576083bb156e922dd42 Client adds jids14e67baa3be536e829bac96ce99b696470c5fb7d Friends table order correctede4b156f1fb6383dbdc58061886a2c529dac7dc5a Client sends messagesf580e431952f1e6a76dc73424b30ecf58ded18fc Rename ClientSocket to CLientSession2ae321e4f8b4228cbd33ac9f3bfa615f0abc55ac Corrected bug0064d8c9319968b4e915145d328caea3db916c7a Database records presence now2e6105c0fd2e16e4e4e9bac7420669d0cf810ffa Refactoring Classesd6f393f24683362035885b61ee1fa9d8d1dade63 Bug no subscribed245c2253b646f44394f23a9b8d8f40e012f7965a Refactored Parsers851d035255316f1f783ebda3518d5b49865b3416 Corrected bug in delete friendd7785bdcc9a6f7b47a4f16ed148d8e7f3d003748 Refactored TCPClientd66fa7137c32c849d96184069494d463e643ff59 Fixed subscription Both to None50196b8de3c7779d59345f1dd5c46779dfe44599 Removes Contacts in Psi423aaf6076b63a2f1bfeaa8a52bea191994a1b90 Adds contacts in Psif807c2478b70dd8e20c306bee5c0bd7446d53cf1 Removed textile docs14ef8800efffd9fef4de0afd5c64afa0811f4886 Merge branch 'client'83c926518e2e6203bc93751343652971d4070597 TCPServer corrected1ff6c3a16a9ed0e2094887f500989281f92e73dc Add and Remove Friends in the DB54f8226571805cd270f9cc4394d66c1c6aaaa844 Roster socks836f34760b749f96451ebff33c83fa9915fc283a Got roster in DB, server and client90a5669fb3cc29fcdf77a6f8798f0a7bc976c599 Client connects6d1498f1baff9327d1ccd03c079d670a495fda44 Refactoring TCPServer1fca13e441ad7de82e4f45f1fb0bb94efd25db3a Getting client inside project4058dc782ef09ac1e3684363a0ec07c69eb637ad Started Scala Client3541730743d18672f941821140a37a9e2840f214 Removed BootClientf3448d826679eff253f19e40e45585af1350e442 Register doned42970c3daa835500226e59f2e0355da0fa7d1e9 Messages go through9508958094586bf8634b72488244816ba7f6b8f9 Removed debugging stuff0218fbc7f037a611dfecb72a682de3efed033448 Not parses messages006a4242d3ef7c011a0fd0ec41fe1cf3119d0ee5 More parsing stuffcd71b397af74563bd6003a25ddadf88ad8d5c344 Changed Stream0fcf7efa70215d1bbd5d42a7ce599970213ef187 Incorrect Encoding3f5920fb7c25ebaf33d4458bad457b3f1b749f10 Improved decoding of SASL Plain3595f146a521ef143a5a592a2bfa970bbba2196c More session and user refactoring01870ca999f1f2c3231961576d269089c3d7677b Has sessions, and now requests rooster58093bd49854b2f832fdab00523f2ce206a00fda Gets resourcee44bd73c67373eee51cdd38a2112b909d36fcb58 Refactored Build with SQLite97b6999ae398ec0c738052367184e69ce9aeffe6 Removed old Helperaebc189fcf5354dad19bee9e2a69511e942bf2cb Merge branch 'f_db'b3af824bc6a21a13fdb066c6ba85f8551f43b622 Refactored XMLParser766d57c631adaa7f25b4b1c91f199b500485ce50 We have Users :)dd6903bd740049198511997700dc70c58efeb10f Added UserManagere48b16942e47da347dc73eb4b5402a1303e1e17f Prints all users, but bugged375a6799e67e5d2ac28861b0ebeb86a78c03a522 Added SQLITE3 with Database Object56c878219b21162542b67c2df7c68c9b9d71733a Connected to Database4831ecbe62b0cd0ae2e1721334c8820708a9dd90 Added SQlite JAR3814b8711813abefdfbde79440fc7a4cf9f41fea Added Synchronized0929a73c779a77b9ce5c74f60c5f1f7fa66c7a03 Removed getId from OutChannel Added register to feature announcement40735aa3597ee8ef5c0f21dab5b65ce34686608c Fixes981c728167a0ecc89608bfe5714ca1453c9ba67e Authentication implemented3730abc0c77deced56ea8837079c26274eba1f54 Corrected Nasty Bug (chars)b00b8c2f89b722d39ec37d8162ad791d79fef1f0 Added SessionManagerd8bda55334a831344a79161b129c4b60c65a9283 last changes93d228dccc016e3708cad2c779c9d290e0739906 Last stuff before beddea4fd9611885517ee800d4ea98fbe4b096d9604 Refactored XMLStringsb3b0314c2b164298c49d2196196ac1cbf7bb3830 Added XMPP Session classe9308e79393129d4208c50a11cf7a32e67374379 Added Python sniffer - Uselessc075f175f127062023efdc127d5ea4c6c76767f4 Base64 addede0127fa56afce1451700d242b47de380d13cbdaf Added simple ruby xmpp client1f67ca3e81277f23c127d216b06595af243bd22b Rearranged XML strings3c70bd65387933877b8a9559641625f93d089706 Removed distc1cd6382d9c57ef3a643266f92dc46baf24268d4 Improved AntBuild961bb1942527e53ade5f0c90c815ae7c477c27e9 Yah, hai kan detect ztrimz nauce76f8a768f8cbb6d643324d34ae7cf72ddab492 Test53cce7cd3c1baf6b82f678aa5ebf7cfdf8ad2ccb Added directory structure with Ant tasks7972eeb179a18e35958ec5d41d5e3f28a4dcf0ee Changed gitignorebb56bfe4ba157b0cfd09e17646115acbec4ef13d Removed HTML folderb411ebfc28786888fe9c6ad36557f305fcbf72df Added DEI doc template4190498ae5f6282792b80bfa7b72990cfdb7cf5b Added relatorio meta 1db77ee5a296109dc245fef2d7bf5165c1972009b Deleted junk944d89e901d2c916822d7a53b0a5c9ec8a5fb042 Added doc stuffe41fd430cbd934e695afe9ae79938e1448e1e54c Added gitignore46de523dd225860232fa35375a26f10f233d0137 Added creditse340acdd9b11b31fcad3598524466032fb875d99 Cleaned Trash640a7a48cbf2d1e530fd4093d93d83e68c6dba78 Initial Readme

milestone3

stage

filesystem

add checkout

commit

tag


git checkout -b f_addusergit checkout mastergit commitgit checkout f_addusergit commitgit commitgit commit

git merge mastergit commitgit checkout mastergit merge f_addusergit branch -d f_adduser


joao diogo

origin

commit

pullpush


joao diogo

origin

commit

pullpush

git push origin f_removeusergit pull origin f_removeusergit push origin :f_removeuser

apaga o branch remotodomingo, 28 de Março de 2010

alojamento e gestão de gitusado por grandes projectosgrátis para opensourceboa visualização

github


exercício


[email protected]


workshop git

Technology