diff options
| author | Thien-Thi Nguyen | 2014-01-10 11:43:18 +0100 |
|---|---|---|
| committer | Thien-Thi Nguyen | 2014-01-10 11:43:18 +0100 |
| commit | 2d7df629f7904bb75aefac1dfb5e9c3f838e815d (patch) | |
| tree | 31e737deaddb16f3e56d9e83f9b7c2abdf7fc921 /admin | |
| parent | cc33cac98a6891edfa5ccf2aee29da81071c0cd4 (diff) | |
| download | emacs-2d7df629f7904bb75aefac1dfb5e9c3f838e815d.tar.gz emacs-2d7df629f7904bb75aefac1dfb5e9c3f838e815d.zip | |
Add some notes on git-bzr; nfc.
* admin/notes/bzr (Using git-bzr): New section.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/notes/bzr | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/admin/notes/bzr b/admin/notes/bzr index d3886abfd69..a3a125cd675 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr | |||
| @@ -364,3 +364,37 @@ works), or by adding an entry to ~/.bazaar/locations.conf: | |||
| 364 | 364 | ||
| 365 | You have to use locations.conf rather than bazaar.conf because the | 365 | You have to use locations.conf rather than bazaar.conf because the |
| 366 | latter has a lower priority than branch.conf. | 366 | latter has a lower priority than branch.conf. |
| 367 | |||
| 368 | * Using git-bzr | ||
| 369 | |||
| 370 | ** initially | ||
| 371 | |||
| 372 | You can use Git locally to talk to the Bazaar repo as a "remote" repo | ||
| 373 | via git-bzr (aka git-remote-bzr). Initial clone: | ||
| 374 | |||
| 375 | git clone bzr::bzr+ssh://USER@bzr.sv.gnu.org/emacs/trunk e | ||
| 376 | |||
| 377 | This creates the working dir e/ (with subdir .git, etc). Disk usage | ||
| 378 | is 13G (as of early 2014), so you will probably want to repack: | ||
| 379 | |||
| 380 | git repack -a -d -f --window=250 --depth=250 --window-memory=N | ||
| 381 | |||
| 382 | where N is chosen to avoid swapping. E.g., given 512MB RAM, N="200m" | ||
| 383 | results in "du -sh .git" => 559M, about double the smallest reported | ||
| 384 | value (obtained with "deprecated" command "git gc --aggressive"). | ||
| 385 | |||
| 386 | ** steady-state | ||
| 387 | |||
| 388 | Use "fetch", "pull" and other remote-to-local commands as usual. | ||
| 389 | |||
| 390 | For "push", the Emacs Bazaar repo is configured with | ||
| 391 | |||
| 392 | append_revisions_only = True | ||
| 393 | |||
| 394 | so some versions of git-remote-bzr may raise AppendRevisionsOnlyViolation | ||
| 395 | (in func do_export) instead of displaying a "non fast-forward" message | ||
| 396 | and skipping the branch. See: | ||
| 397 | |||
| 398 | http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00436.html | ||
| 399 | |||
| 400 | which includes a provisional patch to git-remote-bzr to do that. | ||