Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 62 lines (40 sloc) 1.502 kB
669cefe @pieter Add a README
pieter authored
1 git-bzr: a bidirectional git - bazaar gateway
f1f59fa @kfish formatting, add bzr branch command for fastimport
authored
2 =============================================
669cefe @pieter Add a README
pieter authored
3
f1f59fa @kfish formatting, add bzr branch command for fastimport
authored
4 This script allows you to add bazaar repositories as git branches in your
5 git repository. After that, you can fetch the Bazaar repo, make some
6 changes, and push it back into Bazaar.
669cefe @pieter Add a README
pieter authored
7
f1f59fa @kfish formatting, add bzr branch command for fastimport
authored
8 Usage
9 -----
669cefe @pieter Add a README
pieter authored
10
11 An example session goes like this:
12
90a02ee @kfish remove references to Ruby etc. from README
authored
13 $ git init
5882f37 @JanX2 Added missing dash in README's examples.
JanX2 authored
14 $ git-bzr add upstream ../bzr-branch
15 $ git-bzr fetch upstream
4e47ed8 @goneri fix README: bzr/upstream is now just upstream
goneri authored
16 $ git checkout -b local_branch upstream
669cefe @pieter Add a README
pieter authored
17 $ Hack hack, merge merge....
5882f37 @JanX2 Added missing dash in README's examples.
JanX2 authored
18 $ git-bzr push upstream
669cefe @pieter Add a README
pieter authored
19
d326043 @kfish Add note about valid bzr URLs to README
authored
20 bzr URLs
21 --------
22
23 Note that a bzr URL corresponds to a single bzr branch, and is represented in
24 git as a single branch in your repository.
25
5882f37 @JanX2 Added missing dash in README's examples.
JanX2 authored
26 The URL passed to "git-bzr add" can be any valid bzr URL, such as:
d326043 @kfish Add note about valid bzr URLs to README
authored
27
28 * A local filesystem reference
5882f37 @JanX2 Added missing dash in README's examples.
JanX2 authored
29 git-bzr add upstream ../bzr-branch
d326043 @kfish Add note about valid bzr URLs to README
authored
30 * A remote bzr repository:
5882f37 @JanX2 Added missing dash in README's examples.
JanX2 authored
31 git-bzr add mega-nerd http://www.mega-nerd.com/Bzr/libsndfile-dev/
d326043 @kfish Add note about valid bzr URLs to README
authored
32 * A Launchpad URL:
5882f37 @JanX2 Added missing dash in README's examples.
JanX2 authored
33 git-bzr add upstream lp:inkscape
d326043 @kfish Add note about valid bzr URLs to README
authored
34
35
f1f59fa @kfish formatting, add bzr branch command for fastimport
authored
36 Installation
37 ------------
669cefe @pieter Add a README
pieter authored
38
5c64356 @mcepl Why should I use Ruby, when I could have just bash?
mcepl authored
39 You need a new Git (v 1.6.0 or higher).
669cefe @pieter Add a README
pieter authored
40
f1f59fa @kfish formatting, add bzr branch command for fastimport
authored
41 Furthermore, you need the Bazaar fastimport plugin. It can be found at
42 https://launchpad.net/bzr-fastimport; to fetch it, run:
43
44 $ bzr branch lp:bzr-fastimport
669cefe @pieter Add a README
pieter authored
45
90a02ee @kfish remove references to Ruby etc. from README
authored
46 Finally, you need to install the git-bzr script somewhere.
669cefe @pieter Add a README
pieter authored
47
f1f59fa @kfish formatting, add bzr branch command for fastimport
authored
48 License
49 -------
669cefe @pieter Add a README
pieter authored
50
90a02ee @kfish remove references to Ruby etc. from README
authored
51 The git-bzr script is licensed under the same license as Git.
669cefe @pieter Add a README
pieter authored
52
5ac536f @kfish README: add links to Python rewrites
authored
53
54 SEE ALSO
55 ========
56
57 The following are rewrites in Python and may offer better bzr integration:
58
59 * http://github.com/termie/git-bzr-ng
60
61 * http://github.com/matthew-brett/git-bzr
Something went wrong with that request. Please try again.