aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorThien-Thi Nguyen <[email protected]>2014-01-10 11:43:18 +0100
committerThien-Thi Nguyen <[email protected]>2014-01-10 11:43:18 +0100
commit2d7df629f7904bb75aefac1dfb5e9c3f838e815d (patch)
tree31e737deaddb16f3e56d9e83f9b7c2abdf7fc921 /admin
parentcc33cac98a6891edfa5ccf2aee29da81071c0cd4 (diff)
Add some notes on git-bzr; nfc.
* admin/notes/bzr (Using git-bzr): New section.
Diffstat (limited to 'admin')
-rw-r--r--admin/notes/bzr34
1 files changed, 34 insertions, 0 deletions
diff --git a/admin/notes/bzr b/admin/notes/bzr
index d3886abfd6..a3a125cd67 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -364,3 +364,37 @@ works), or by adding an entry to ~/.bazaar/locations.conf:
You have to use locations.conf rather than bazaar.conf because the
latter has a lower priority than branch.conf.
+
+* Using git-bzr
+
+** initially
+
+You can use Git locally to talk to the Bazaar repo as a "remote" repo
+via git-bzr (aka git-remote-bzr). Initial clone:
+
+ git clone bzr::bzr+ssh://[email protected]/emacs/trunk e
+
+This creates the working dir e/ (with subdir .git, etc). Disk usage
+is 13G (as of early 2014), so you will probably want to repack:
+
+ git repack -a -d -f --window=250 --depth=250 --window-memory=N
+
+where N is chosen to avoid swapping. E.g., given 512MB RAM, N="200m"
+results in "du -sh .git" => 559M, about double the smallest reported
+value (obtained with "deprecated" command "git gc --aggressive").
+
+** steady-state
+
+Use "fetch", "pull" and other remote-to-local commands as usual.
+
+For "push", the Emacs Bazaar repo is configured with
+
+ append_revisions_only = True
+
+so some versions of git-remote-bzr may raise AppendRevisionsOnlyViolation
+(in func do_export) instead of displaying a "non fast-forward" message
+and skipping the branch. See:
+
+ http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00436.html
+
+which includes a provisional patch to git-remote-bzr to do that.