SlideShare a Scribd company logo
Bzr & LaunchPad: Sharing Your Work with Others 3 July 2010, Sahana Camp Fran Boon [email_address]
Sharing your work with others ,[object Object],[object Object],[object Object]
Branches LaunchPad Merge proposal Trunk Local Branch Server Your Branch bzr merge bzr push bzr pull
LP: Public/Private Key ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]
LP: Public/Private Key ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]
Register an account on LP ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]
Push a branch to LP ,[object Object],[object Object],[object Object],[object Object]
Merge with a branch on LP ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]
Resolve Conflicts ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]
Subscribe to Branch ,[object Object],[object Object],[object Object]
Pull a new branch from LP ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]
Merge Proposal ,[object Object],[object Object],[object Object],[object Object]
Branches LaunchPad Merge proposal Trunk Local Branch Server Your Branch bzr merge bzr push bzr pull
End

More Related Content

What's hot

Windows 7 command prompt commands
Windows 7 command prompt commandsWindows 7 command prompt commands
Windows 7 command prompt commands
Abdullah Khosa
 
Linux Based Network Proposal
Linux Based Network ProposalLinux Based Network Proposal
Linux Based Network Proposal
Chris Riccio
 
Dos commands
Dos commandsDos commands
Dos commands
suraj pandey
 
Dos commad. by ammar nawab ppt
Dos commad. by ammar nawab pptDos commad. by ammar nawab ppt
Dos commad. by ammar nawab ppt
Ammar_n
 
Dos commands
Dos commandsDos commands
Dos commands
ravindravalmiki26
 
Internal commands.29to30
Internal commands.29to30Internal commands.29to30
Internal commands.29to30
myrajendra
 
A z index of the windows cmd command line
A z index of the windows cmd command lineA z index of the windows cmd command line
A z index of the windows cmd command line
proser tech
 
Unit II - MS DOS Commands
Unit II - MS DOS CommandsUnit II - MS DOS Commands
Unit II - MS DOS Commands
Hepsijeba
 
Internal commands of dos
Internal commands of dosInternal commands of dos
Internal commands of dos
Nargiskhan786
 
CMD Command
CMD CommandCMD Command
CMD Command
Chandra Pr. Singh
 
Msdos crash course
Msdos crash courseMsdos crash course
Msdos crash course
Devinder Prasad
 
Ms DOS
Ms DOSMs DOS
Ms DOS
Gunjan Singh
 
Terminal commands ubuntu 2
Terminal commands ubuntu 2Terminal commands ubuntu 2
Terminal commands ubuntu 2
raj upadhyay
 
Command prompt presentation
Command prompt presentationCommand prompt presentation
Command prompt presentation
Muhammad Taj
 
Introduction to ms dos
Introduction to ms dosIntroduction to ms dos
Introduction to ms dos
Indika Rathninda
 
Basic dos-commands
Basic dos-commandsBasic dos-commands
Basic dos-commands
parag dhok
 
Comands of dos
Comands of dosComands of dos
Comands of dos
Muhammad Zohaib
 
Ubuntu Terminal
Ubuntu TerminalUbuntu Terminal
Ubuntu Terminal
Cathy Woods
 

What's hot (18)

Windows 7 command prompt commands
Windows 7 command prompt commandsWindows 7 command prompt commands
Windows 7 command prompt commands
 
Linux Based Network Proposal
Linux Based Network ProposalLinux Based Network Proposal
Linux Based Network Proposal
 
Dos commands
Dos commandsDos commands
Dos commands
 
Dos commad. by ammar nawab ppt
Dos commad. by ammar nawab pptDos commad. by ammar nawab ppt
Dos commad. by ammar nawab ppt
 
Dos commands
Dos commandsDos commands
Dos commands
 
Internal commands.29to30
Internal commands.29to30Internal commands.29to30
Internal commands.29to30
 
A z index of the windows cmd command line
A z index of the windows cmd command lineA z index of the windows cmd command line
A z index of the windows cmd command line
 
Unit II - MS DOS Commands
Unit II - MS DOS CommandsUnit II - MS DOS Commands
Unit II - MS DOS Commands
 
Internal commands of dos
Internal commands of dosInternal commands of dos
Internal commands of dos
 
CMD Command
CMD CommandCMD Command
CMD Command
 
Msdos crash course
Msdos crash courseMsdos crash course
Msdos crash course
 
Ms DOS
Ms DOSMs DOS
Ms DOS
 
Terminal commands ubuntu 2
Terminal commands ubuntu 2Terminal commands ubuntu 2
Terminal commands ubuntu 2
 
Command prompt presentation
Command prompt presentationCommand prompt presentation
Command prompt presentation
 
Introduction to ms dos
Introduction to ms dosIntroduction to ms dos
Introduction to ms dos
 
Basic dos-commands
Basic dos-commandsBasic dos-commands
Basic dos-commands
 
Comands of dos
Comands of dosComands of dos
Comands of dos
 
Ubuntu Terminal
Ubuntu TerminalUbuntu Terminal
Ubuntu Terminal
 

Similar to Sahana sharing your work with others

BZR & LaunchPad : Sharing Your Work With Others (SahanaCamp 1.2)
BZR & LaunchPad : Sharing Your Work With Others (SahanaCamp 1.2)BZR & LaunchPad : Sharing Your Work With Others (SahanaCamp 1.2)
BZR & LaunchPad : Sharing Your Work With Others (SahanaCamp 1.2)
AidIQ
 
Sandy Report
Sandy ReportSandy Report
Sandy Report
sandeepkumar907
 
Samba server configuration
Samba server configurationSamba server configuration
Samba server configuration
Rohit Phulsunge
 
Linux conf-admin
Linux conf-adminLinux conf-admin
Linux conf-admin
badamisri
 
Linux Conf Admin
Linux Conf AdminLinux Conf Admin
Linux Conf Admin
Srinivas Badami
 
Linux conf-admin
Linux conf-adminLinux conf-admin
Linux conf-admin
badamisri
 
Devops for beginners
Devops for beginnersDevops for beginners
Devops for beginners
Vivek Parihar
 
Ubuntu getting started
Ubuntu getting startedUbuntu getting started
Ubuntu getting started
Ernesto Celis
 
Linux
LinuxLinux
Linux Survival Kit for Proof of Concept & Proof of Technology
Linux Survival Kit for Proof of Concept & Proof of TechnologyLinux Survival Kit for Proof of Concept & Proof of Technology
Linux Survival Kit for Proof of Concept & Proof of Technology
Nugroho Gito
 
Lab manual
Lab manualLab manual
Lab manual
BNilavara
 
lec1.docx
lec1.docxlec1.docx
lec1.docx
ismailaboshatra
 
Step by step_linux_guide
Step by step_linux_guideStep by step_linux_guide
Step by step_linux_guide
vinod31dec
 
Linux commands part4
Linux commands part4Linux commands part4
Linux commands part4
bhatvijetha
 
Samba
SambaSamba
Samba
tmavroidis
 
Securing Windows Remote Desktop With Copssh
Securing Windows Remote Desktop With CopsshSecuring Windows Remote Desktop With Copssh
Securing Windows Remote Desktop With Copssh
Crismer La Pignola
 
Openfire xmpp server on windows server 2012 r2 with spark sso
Openfire xmpp server on windows server 2012 r2 with spark ssoOpenfire xmpp server on windows server 2012 r2 with spark sso
Openfire xmpp server on windows server 2012 r2 with spark sso
laonap166
 
Getting Started With Subversion
Getting Started With SubversionGetting Started With Subversion
Getting Started With Subversion
Jordan Hatch
 
Advanced Level Training on Koha / TLS (ToT)
Advanced Level Training on Koha / TLS (ToT)Advanced Level Training on Koha / TLS (ToT)
Advanced Level Training on Koha / TLS (ToT)
Ata Rehman
 
Linux
LinuxLinux
Linux
Rathan Raj
 

Similar to Sahana sharing your work with others (20)

BZR & LaunchPad : Sharing Your Work With Others (SahanaCamp 1.2)
BZR & LaunchPad : Sharing Your Work With Others (SahanaCamp 1.2)BZR & LaunchPad : Sharing Your Work With Others (SahanaCamp 1.2)
BZR & LaunchPad : Sharing Your Work With Others (SahanaCamp 1.2)
 
Sandy Report
Sandy ReportSandy Report
Sandy Report
 
Samba server configuration
Samba server configurationSamba server configuration
Samba server configuration
 
Linux conf-admin
Linux conf-adminLinux conf-admin
Linux conf-admin
 
Linux Conf Admin
Linux Conf AdminLinux Conf Admin
Linux Conf Admin
 
Linux conf-admin
Linux conf-adminLinux conf-admin
Linux conf-admin
 
Devops for beginners
Devops for beginnersDevops for beginners
Devops for beginners
 
Ubuntu getting started
Ubuntu getting startedUbuntu getting started
Ubuntu getting started
 
Linux
LinuxLinux
Linux
 
Linux Survival Kit for Proof of Concept & Proof of Technology
Linux Survival Kit for Proof of Concept & Proof of TechnologyLinux Survival Kit for Proof of Concept & Proof of Technology
Linux Survival Kit for Proof of Concept & Proof of Technology
 
Lab manual
Lab manualLab manual
Lab manual
 
lec1.docx
lec1.docxlec1.docx
lec1.docx
 
Step by step_linux_guide
Step by step_linux_guideStep by step_linux_guide
Step by step_linux_guide
 
Linux commands part4
Linux commands part4Linux commands part4
Linux commands part4
 
Samba
SambaSamba
Samba
 
Securing Windows Remote Desktop With Copssh
Securing Windows Remote Desktop With CopsshSecuring Windows Remote Desktop With Copssh
Securing Windows Remote Desktop With Copssh
 
Openfire xmpp server on windows server 2012 r2 with spark sso
Openfire xmpp server on windows server 2012 r2 with spark ssoOpenfire xmpp server on windows server 2012 r2 with spark sso
Openfire xmpp server on windows server 2012 r2 with spark sso
 
Getting Started With Subversion
Getting Started With SubversionGetting Started With Subversion
Getting Started With Subversion
 
Advanced Level Training on Koha / TLS (ToT)
Advanced Level Training on Koha / TLS (ToT)Advanced Level Training on Koha / TLS (ToT)
Advanced Level Training on Koha / TLS (ToT)
 
Linux
LinuxLinux
Linux
 

More from AidIQ

Tech 2 - Introduction to the Code
Tech 2 - Introduction to the CodeTech 2 - Introduction to the Code
Tech 2 - Introduction to the Code
AidIQ
 
Tech 1 - Deploying Sahana Eden
Tech 1  - Deploying Sahana EdenTech 1  - Deploying Sahana Eden
Tech 1 - Deploying Sahana Eden
AidIQ
 
Introduction to Sahana Eden
Introduction to Sahana EdenIntroduction to Sahana Eden
Introduction to Sahana Eden
AidIQ
 
Bombeiros Workshop - Introduction to Sahana Eden
Bombeiros Workshop - Introduction to Sahana EdenBombeiros Workshop - Introduction to Sahana Eden
Bombeiros Workshop - Introduction to Sahana Eden
AidIQ
 
Sahana Open Source Humanitarian Software Project - Pandemic Preparedness Forum
Sahana Open Source Humanitarian Software Project - Pandemic Preparedness ForumSahana Open Source Humanitarian Software Project - Pandemic Preparedness Forum
Sahana Open Source Humanitarian Software Project - Pandemic Preparedness Forum
AidIQ
 
Humanitarian Mapping - Sahana and OpenStreetMap
Humanitarian Mapping - Sahana and OpenStreetMapHumanitarian Mapping - Sahana and OpenStreetMap
Humanitarian Mapping - Sahana and OpenStreetMap
AidIQ
 
Sahana Eden : Introduction and Simulation A (SahanaCamp 1.2)
Sahana Eden : Introduction and Simulation A (SahanaCamp 1.2)Sahana Eden : Introduction and Simulation A (SahanaCamp 1.2)
Sahana Eden : Introduction and Simulation A (SahanaCamp 1.2)
AidIQ
 
Sahana Eden : Developer Environment (VM) (SahanaCamp 1.2)
Sahana Eden : Developer Environment (VM) (SahanaCamp 1.2)Sahana Eden : Developer Environment (VM) (SahanaCamp 1.2)
Sahana Eden : Developer Environment (VM) (SahanaCamp 1.2)
AidIQ
 
Sahana Eden : Deployment (SahanaCamp 1.2)
Sahana Eden : Deployment (SahanaCamp 1.2)Sahana Eden : Deployment (SahanaCamp 1.2)
Sahana Eden : Deployment (SahanaCamp 1.2)
AidIQ
 
Sahana Eden : Bug Reporting (SahanaCamp 1.2)
Sahana Eden : Bug Reporting (SahanaCamp 1.2)Sahana Eden : Bug Reporting (SahanaCamp 1.2)
Sahana Eden : Bug Reporting (SahanaCamp 1.2)
AidIQ
 
Sahana : Case Studies (SahanaCamp 1.2)
Sahana : Case Studies (SahanaCamp 1.2)Sahana : Case Studies (SahanaCamp 1.2)
Sahana : Case Studies (SahanaCamp 1.2)
AidIQ
 
Participatory programming
Participatory programmingParticipatory programming
Participatory programming
AidIQ
 
OpenStreetMap : Technical (SahanaCamp 1.2)
OpenStreetMap : Technical (SahanaCamp 1.2)OpenStreetMap : Technical (SahanaCamp 1.2)
OpenStreetMap : Technical (SahanaCamp 1.2)
AidIQ
 
OpenStreetMap : Sahana Mapping Client (SahanaCamp 1.2)
OpenStreetMap : Sahana Mapping Client (SahanaCamp 1.2)OpenStreetMap : Sahana Mapping Client (SahanaCamp 1.2)
OpenStreetMap : Sahana Mapping Client (SahanaCamp 1.2)
AidIQ
 
Simulation: Instructions ((SahanaCamp 1.2)
Simulation: Instructions ((SahanaCamp 1.2)Simulation: Instructions ((SahanaCamp 1.2)
Simulation: Instructions ((SahanaCamp 1.2)
AidIQ
 
Simulation: Incidents (SahanaCamp 1.2)
Simulation: Incidents (SahanaCamp 1.2)Simulation: Incidents (SahanaCamp 1.2)
Simulation: Incidents (SahanaCamp 1.2)
AidIQ
 
Implementing IT Solutions for Disaster Management (SahanaCamp 1.2)
Implementing IT Solutions for Disaster Management (SahanaCamp 1.2)Implementing IT Solutions for Disaster Management (SahanaCamp 1.2)
Implementing IT Solutions for Disaster Management (SahanaCamp 1.2)
AidIQ
 
General Sessions Hand Outs (SahanaCamp 1.2)
General Sessions Hand Outs (SahanaCamp 1.2)General Sessions Hand Outs (SahanaCamp 1.2)
General Sessions Hand Outs (SahanaCamp 1.2)
AidIQ
 
Sahana Eden : Introduction to the Code (SahanaCamp 1.2)
Sahana Eden : Introduction to the Code (SahanaCamp 1.2)Sahana Eden : Introduction to the Code (SahanaCamp 1.2)
Sahana Eden : Introduction to the Code (SahanaCamp 1.2)
AidIQ
 
GHC Participant Training
GHC Participant TrainingGHC Participant Training
GHC Participant Training
AidIQ
 

More from AidIQ (20)

Tech 2 - Introduction to the Code
Tech 2 - Introduction to the CodeTech 2 - Introduction to the Code
Tech 2 - Introduction to the Code
 
Tech 1 - Deploying Sahana Eden
Tech 1  - Deploying Sahana EdenTech 1  - Deploying Sahana Eden
Tech 1 - Deploying Sahana Eden
 
Introduction to Sahana Eden
Introduction to Sahana EdenIntroduction to Sahana Eden
Introduction to Sahana Eden
 
Bombeiros Workshop - Introduction to Sahana Eden
Bombeiros Workshop - Introduction to Sahana EdenBombeiros Workshop - Introduction to Sahana Eden
Bombeiros Workshop - Introduction to Sahana Eden
 
Sahana Open Source Humanitarian Software Project - Pandemic Preparedness Forum
Sahana Open Source Humanitarian Software Project - Pandemic Preparedness ForumSahana Open Source Humanitarian Software Project - Pandemic Preparedness Forum
Sahana Open Source Humanitarian Software Project - Pandemic Preparedness Forum
 
Humanitarian Mapping - Sahana and OpenStreetMap
Humanitarian Mapping - Sahana and OpenStreetMapHumanitarian Mapping - Sahana and OpenStreetMap
Humanitarian Mapping - Sahana and OpenStreetMap
 
Sahana Eden : Introduction and Simulation A (SahanaCamp 1.2)
Sahana Eden : Introduction and Simulation A (SahanaCamp 1.2)Sahana Eden : Introduction and Simulation A (SahanaCamp 1.2)
Sahana Eden : Introduction and Simulation A (SahanaCamp 1.2)
 
Sahana Eden : Developer Environment (VM) (SahanaCamp 1.2)
Sahana Eden : Developer Environment (VM) (SahanaCamp 1.2)Sahana Eden : Developer Environment (VM) (SahanaCamp 1.2)
Sahana Eden : Developer Environment (VM) (SahanaCamp 1.2)
 
Sahana Eden : Deployment (SahanaCamp 1.2)
Sahana Eden : Deployment (SahanaCamp 1.2)Sahana Eden : Deployment (SahanaCamp 1.2)
Sahana Eden : Deployment (SahanaCamp 1.2)
 
Sahana Eden : Bug Reporting (SahanaCamp 1.2)
Sahana Eden : Bug Reporting (SahanaCamp 1.2)Sahana Eden : Bug Reporting (SahanaCamp 1.2)
Sahana Eden : Bug Reporting (SahanaCamp 1.2)
 
Sahana : Case Studies (SahanaCamp 1.2)
Sahana : Case Studies (SahanaCamp 1.2)Sahana : Case Studies (SahanaCamp 1.2)
Sahana : Case Studies (SahanaCamp 1.2)
 
Participatory programming
Participatory programmingParticipatory programming
Participatory programming
 
OpenStreetMap : Technical (SahanaCamp 1.2)
OpenStreetMap : Technical (SahanaCamp 1.2)OpenStreetMap : Technical (SahanaCamp 1.2)
OpenStreetMap : Technical (SahanaCamp 1.2)
 
OpenStreetMap : Sahana Mapping Client (SahanaCamp 1.2)
OpenStreetMap : Sahana Mapping Client (SahanaCamp 1.2)OpenStreetMap : Sahana Mapping Client (SahanaCamp 1.2)
OpenStreetMap : Sahana Mapping Client (SahanaCamp 1.2)
 
Simulation: Instructions ((SahanaCamp 1.2)
Simulation: Instructions ((SahanaCamp 1.2)Simulation: Instructions ((SahanaCamp 1.2)
Simulation: Instructions ((SahanaCamp 1.2)
 
Simulation: Incidents (SahanaCamp 1.2)
Simulation: Incidents (SahanaCamp 1.2)Simulation: Incidents (SahanaCamp 1.2)
Simulation: Incidents (SahanaCamp 1.2)
 
Implementing IT Solutions for Disaster Management (SahanaCamp 1.2)
Implementing IT Solutions for Disaster Management (SahanaCamp 1.2)Implementing IT Solutions for Disaster Management (SahanaCamp 1.2)
Implementing IT Solutions for Disaster Management (SahanaCamp 1.2)
 
General Sessions Hand Outs (SahanaCamp 1.2)
General Sessions Hand Outs (SahanaCamp 1.2)General Sessions Hand Outs (SahanaCamp 1.2)
General Sessions Hand Outs (SahanaCamp 1.2)
 
Sahana Eden : Introduction to the Code (SahanaCamp 1.2)
Sahana Eden : Introduction to the Code (SahanaCamp 1.2)Sahana Eden : Introduction to the Code (SahanaCamp 1.2)
Sahana Eden : Introduction to the Code (SahanaCamp 1.2)
 
GHC Participant Training
GHC Participant TrainingGHC Participant Training
GHC Participant Training
 

Sahana sharing your work with others

Editor's Notes

  1. Distributed Version Control allows faster development with more flexible options for sharing code between developers. Variant of famous Open Source phrase “Release Early, Release Often”
  2. Normally you work in a local branch on your PC. You Merge changes in regularly from Trunk. You Push your changes to your branch on LaunchPad You Pull from LaunchPad to update your server sites
  3. Required for LaunchPad: https://help.launchpad.net/YourAccount/CreatingAnSSHKeyPair No need to create a new one if you already have one http://the.earth.li/~sgtatham/putty/latest/x86/puttygen.exe
  4. NB If Cygwin is installed then use the .ssh folder in your cygwin folder Windows Explorer cannot create folders which start with a dot, so need to create in the shell Save the files to the .ssh directory created NB Do Not just ‘Save Private Key’ as this will not work.
  5. Copy/Paste from textbox rather than saved Public Key to avoid having to trim down to just what’s needed.
  6. https://help.launchpad.net/Code/UploadingABranch
  7. http://kdiff3.sourceforge.net