[Emacs-diffs] trunk r115959: Add some notes on git-bzr; nfc.

[Thien-Thi Nguyen]

------------------------------------------------------------
revno: 115959
revision-id: address@hidden
parent: address@hidden
committer: Thien-Thi Nguyen <address@hidden>
branch nick: master
timestamp: Fri 2014-01-10 11:43:18 +0100
message:
  Add some notes on git-bzr; nfc.
  
  * admin/notes/bzr (Using git-bzr): New section.
modified:
  admin/notes/bzr                bzr-20100518025134-ebvhi2w74h1r56u7-1

=== modified file 'admin/notes/bzr'
--- a/admin/notes/bzr   2013-08-29 01:18:51 +0000
+++ b/admin/notes/bzr   2014-01-10 10:43:18 +0000
@@ -364,3 +364,37 @@
 
 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://address@hidden/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.