Bazaar. Distributed Version Control. Andrew Bennetts 5th April, Introduction Bazaar: Distributed Version Control The End

Transcription

1 : Distributed Version Control Distributed Version Control Andrew Bennetts 5th April, 2007

2 : Distributed Version Control Outline Who am I? Introduction Who am I? : Distributed Version Control 5-minute guide to using Why? Questions?

3 : Distributed Version Control Outline Who am I? Who am I? Or, why should you listen to me?

4 : Distributed Version Control Outline Who am I? Who am I? Or, why should you listen to me? I work on... Launchpad Twisted

5 : Distributed Version Control 5-minute guide to using Why? : Distributed Version Control

6 : Distributed Version Control Versioning a new project from scratch 5-minute guide to using Why? $ bzr init new-project $ cd new-project $ vim foo.py $ bzr add added foo.py $ bzr commit -m "Start writing foo.py"

7 Sharing your work Introduction : Distributed Version Control 5-minute guide to using Why? $ bzr push sftp://example.com/ /public html/new-project

8 Sharing your work Introduction : Distributed Version Control 5-minute guide to using Why? $ bzr push

9 Making a branch Introduction : Distributed Version Control 5-minute guide to using Why? $ bzr branch andrew/new-project

10 Making a branch Introduction : Distributed Version Control 5-minute guide to using Why? $ bzr branch andrew/new-project $ cd new-project $ vim foo.py $ bzr commit...

11 : Distributed Version Control 5-minute guide to using Why? No central repository required to collaborate

12 : Distributed Version Control 5-minute guide to using Why? No central repository required to collaborate That s it, really

13 : Distributed Version Control 5-minute guide to using Why? But I like having a common trunk.

14 : Distributed Version Control 5-minute guide to using Why? But I like having a common trunk. That s ok. doesn t mind: $ bzr checkout sftp://host/code/super-project $ cd super-project $ vim super-logic-module.py... $ bzr commit

15 : Distributed Version Control 5-minute guide to using Why?

16 : Distributed Version Control 5-minute guide to using Why? Branches.

17 : Distributed Version Control 5-minute guide to using Why? Branches. makes it very easy for anyone to branch, and is very good at merging branches.

18 : Distributed Version Control 5-minute guide to using Why? Branches. makes it very easy for anyone to branch, and is very good at merging branches. This makes policies like one branch per bug fix/feature as painless as possible. See my OSDC talk last year for why this sort of policy is a good thing ;)

19 : Distributed Version Control 5-minute guide to using Why?

20 : Distributed Version Control 5-minute guide to using Why? Work offline.

21 : Distributed Version Control 5-minute guide to using Why? Work offline. You get full history locally, on your laptop. You can commit when on a train, and merge later. You can do bzr log bzr annotate, etc.

22 Merging is easy Introduction : Distributed Version Control 5-minute guide to using Why? $ bzr merge url://to/another/branch...resolve conflicts, if any... $ bzr commit

23 : Distributed Version Control 5-minute guide to using Why? Why? it s written in Python it s easy to use very active development community pretty fast, and getting faster

24 Why? Introduction : Distributed Version Control 5-minute guide to using Why? Lots of little reasons too:

25 : Distributed Version Control 5-minute guide to using Why? Why? Lots of little reasons too: bzr uncommit

26 : Distributed Version Control 5-minute guide to using Why? Why? Lots of little reasons too: bzr uncommit bzr shelve (part of the bzrtools plugin)

27 : Distributed Version Control 5-minute guide to using Why? Why? Lots of little reasons too: bzr uncommit bzr shelve (part of the bzrtools plugin) bzr viz (part of the bzr-gtk plugin)

28 : Distributed Version Control 5-minute guide to using Why? Why? Lots of little reasons too: bzr uncommit bzr shelve (part of the bzrtools plugin) bzr viz (part of the bzr-gtk plugin) SVN plugin: bzr branch

29 : Distributed Version Control Questions?

30 : Distributed Version Control Questions? Questions? Questions?