What's cooking (2014/05 #02)
Junio C Hamano committed
May 9, 2014 at 13:58 UTC
7cb65596207bb0493dc09b042c52679db683c48f
1 file changed
+256
-135
whats-cooking.txt
+256
-135
@@ -1,21 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2014, #01; Tue, 6)
4
-X-master-at: b4f86a4ce85e4e370a67455de6586a02f158a789
5
-X-next-at: cfa251bb0195ab6f98c8c86125e8419cea21247d
3
+Subject: What's cooking in git.git (May 2014, #02; Fri, 9)
4
+X-master-at: b28aeab4ec1df28f3be3cb62ff4b85e5332d8d13
5
+X-next-at: b2ff043d5327709c5228ef35b94974af38e78e42
6
7
-What's cooking in git.git (May 2014, #01; Tue, 6)
7
+What's cooking in git.git (May 2014, #02; Fri, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-The tip of the 'master' branch has passed v2.0.0-rc1. Last minute
15
-fixes to newly added code keep flowing in, which is good. I've
16
-picked up some topics that will not be part of the upcoming release
17
-to 'pu' not to lose them, but I didn't have time to give them a deep
18
-reading.
14
+The tip of the 'master' branch is at v2.0.0-rc3, which is in sync
15
+with v1.9.3 with respect to bugfixes that was also tagged today.
16
+Hopefully we can tag v2.0.0 final late next week.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -23,112 +21,101 @@ of the repositories listed at
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
--------------------------------------------------
26
-[Graduated to "master"]
24
+[New Topics]
25
28
-* km/git-svn-workaround-older-getopt-long (2014-04-23) 1 commit
29
- (merged to 'next' on 2014-04-23 at 3f35586)
30
- + t9117: use --prefix "" instead of --prefix=""
26
+* dk/raise-core-deltabasecachelimit (2014-05-06) 1 commit
27
+ - Bump core.deltaBaseCacheLimit to 96m
28
32
- Finishing touches to a change that is already in 'master'.
29
+ The original 16 MiB limit for the in-core delta-base-cache
30
+ introduced in 18bdec11 (Limit the size of the new delta_base_cache,
31
+ 2007-03-19) is turning too small.
32
33
+ Will merge to 'next' and keep it there for the rest of this cycle.
34
35
-* mk/doc-git-gui-display-untracked (2014-04-21) 1 commit
36
- (merged to 'next' on 2014-04-22 at 385d39a)
37
- + Documentation: git-gui: describe gui.displayuntracked
35
36
+* fc/remote-hg-fixes-for-hg-3.0 (2014-05-08) 5 commits
37
+ - [DONTMERGE-not signed-off] remote-hg: work with older versions of mercurial
38
+ - remote-hg: add support for hg v3.0
39
+ - t: remote-hg: trivial cleanups and fixes
40
+ - t: remote-hg: add file operation tests
41
+ - remote-hg: add more tests
42
40
-* mw/symlinks (2014-04-24) 1 commit
41
- (merged to 'next' on 2014-04-25 at 20b2af6)
42
- + setup: fix windows path buffer over-stepping
43
+ Update remote-hg helper to work with newer versions of Mercurial,
44
+ and fixes an incompatibility with older versions triggered by new
45
+ tests.
46
44
- A finishing touch fix to a new change already in 'master'.
47
+ Will merge to 'next' and keep it there for the rest of this cycle.
48
49
47
-* rh/prompt-pcmode-avoid-eval-on-refname (2014-04-22) 1 commit
48
- (merged to 'next' on 2014-04-22 at 3a1506f)
49
- + git-prompt.sh: don't put unsanitized branch names in $PS1
50
+* fc/status-printf-squelch-format-zero-length-warnings (2014-05-07) 1 commit
51
+ - silence a bunch of format-zero-length warnings
52
51
---------------------------------------------------
52
-[New Topics]
53
+ Will merge to 'next' and keep it there for the rest of this cycle.
54
54
-* bg/strbuf-trim (2014-04-30) 2 commits
55
- - api-strbuf.txt: Add docs for _trim and _ltrim
56
- - strbuf: Use _rtrim and _ltrim in strbuf_trim
55
58
- Will merge to 'next'.
56
+* jk/grep-tell-run-command-to-cd-when-running-pager (2014-05-07) 1 commit
57
+ - grep: use run-command's "dir" option for --open-files-in-pager
58
59
+ Will merge to 'next' and keep it there for the rest of this cycle.
60
61
-* cb/byte-order (2014-05-02) 2 commits
62
- - compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
63
- - compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
61
65
- Will merge to 'next'.
62
+* jk/squelch-compiler-warning-from-funny-error-macro (2014-05-06) 2 commits
63
+ - let clang use the constant-return error() macro
64
+ - inline constant return from error() function
65
66
+ Will merge to 'next' and keep it there for the rest of this cycle.
67
68
-* dt/api-doc-setup-gently (2014-04-30) 1 commit
69
- - docs: document RUN_SETUP_GENTLY and clarify RUN_SETUP
68
71
- Will merge to 'next'.
69
+* rs/reflog-exists (2014-05-08) 2 commits
70
+ - checkout.c: use ref_exists instead of file_exist
71
+ - refs.c: add new functions reflog_exists and delete_reflog
72
73
+ Will merge to 'next' and keep it there for the rest of this cycle.
74
74
-* dt/merge-recursive-case-insensitive (2014-05-06) 1 commit
75
- - merge-recursive.c: Fix case-changing merge bug
75
76
+* tg/tag-state-tag-name-in-editor-hints (2014-05-07) 1 commit
77
+ - builtin/tag.c: show tag name to hint in the message editor
78
78
-* ew/config-protect-mode (2014-05-06) 1 commit
79
- - config: preserve config file permissions on edits
79
+ Will merge to 'next' and keep it there for the rest of this cycle.
80
81
- Will merge to 'next'.
81
82
+* sk/submodules-absolute-path-on-windows (2014-05-08) 1 commit
83
+ - Revert "submodules: fix ambiguous absolute paths under Windows"
84
84
-* fc/rerere-conflict-style (2014-04-30) 1 commit
85
- - rerere: fix for merge.conflictstyle
85
+ Will merge to 'next' and keep it there for the rest of this cycle.
86
87
- Will merge to 'next'.
87
88
+* jn/contrib-remove-diffall (2014-05-09) 1 commit
89
+ - contrib: remove git-diffall
90
90
-* jc/coding-guidelines (2014-05-02) 8 commits
91
- - CodingGuidelines: on splitting a long line
92
- - CodingGuidelines: on comparison
93
- - CodingGuidelines: do not call the conditional statement "if()"
94
- - CodingGuidelines: give an example for shell function preamble
95
- - CodingGuidelines: give an example for control statements
96
- - CodingGuidelines: give an example for redirection
97
- - CodingGuidelines: give an example for case/esac statement
98
- - CodingGuidelines: once it is in, it is not worth the code churn
91
+ Spring cleaning of contrib/.
92
100
- Needs to be rerolled.
93
+ Will merge to 'next' and keep it there for the rest of this cycle.
94
95
103
-* jd/subtree (2014-05-06) 5 commits
104
- - contrib/subtree/Makefile: clean rule cleanup
105
- - contrib/subtree/Makefile: Doc-gen rules cleanup
106
- - contrib/subtree/Makefile: s/libexecdir/gitexecdir
107
- - contrib/subtree/Makefile: Use GIT-VERSION-FILE
108
- - contrib/subtree/Makefile: scrap unused $(gitdir)
96
+* jn/contrib-remove-vim (2014-05-09) 1 commit
97
+ - contrib: remove vim support instructions
98
110
- Will merge to 'next'.
99
+ Spring cleaning of contrib/.
100
101
+ Will merge to 'next' and keep it there for the rest of this cycle.
102
113
-* jk/commit-date-approxidate (2014-05-02) 4 commits
114
- - commit: accept more date formats for "--date"
115
- - commit: print "Date" line when the user has set date
116
- - pretty: make show_ident_date public
117
- - commit: use split_ident_line to compare author/committer
103
119
- Will merge to 'next'.
104
+* ss/howto-manage-trunk (2014-05-09) 8 commits
105
+ - SQUASH describe what the picture shows
106
+ - SQUASH minor typographic fix
107
+ - SQUASH clarify the informal description of 'trunk'
108
+ - SQUASH typeset literal commands with `git command`
109
+ - SQUASH use a better URL
110
+ - SQUASH mark-up fix
111
+ - SQUASH typofix
112
+ - How to keep a project's canonical history correct.
113
114
122
-* mm/pager-less-sans-S (2014-04-30) 1 commit
123
- - pager: remove 'S' from $LESS by default
115
+* wg/svn-fe-style-fixes (2014-05-09) 1 commit
116
+ - svn-fe: Conform to pep8
117
125
- Will merge to 'next'.
126
-
127
-
128
-* sk/msvc-dynlink-crt (2014-05-06) 1 commit
129
- - MSVC: link dynamically to the CRT
130
-
131
- Will merge to 'next'.
118
+ Will merge to 'next' and keep it there for the rest of this cycle.
119
120
--------------------------------------------------
121
[Stalled]
@@ -280,37 +267,165 @@ of the repositories listed at
267
--------------------------------------------------
268
[Cooking]
269
270
+* bg/strbuf-trim (2014-05-06) 2 commits
271
+ (merged to 'next' on 2014-05-07 at 978f378)
272
+ + api-strbuf.txt: add docs for _trim and _ltrim
273
+ + strbuf: use _rtrim and _ltrim in strbuf_trim
274
+
275
+ Will keep in 'next' for the remainder of the cycle.
276
+
277
+
278
+* cb/byte-order (2014-05-02) 2 commits
279
+ (merged to 'next' on 2014-05-07 at f55c040)
280
+ + compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
281
+ + compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
282
+
283
+ Compatibility enhancement for Solaris.
284
+
285
+ Will keep in 'next' for the remainder of the cycle.
286
+
287
+
288
+* dt/api-doc-setup-gently (2014-04-30) 1 commit
289
+ (merged to 'next' on 2014-05-07 at 6054b08)
290
+ + docs: document RUN_SETUP_GENTLY and clarify RUN_SETUP
291
+
292
+ Will keep in 'next' for the remainder of the cycle.
293
+
294
+
295
+* dt/merge-recursive-case-insensitive (2014-05-08) 2 commits
296
+ - mv: allow renaming to fix case on case insensitive filesystems
297
+ - merge-recursive.c: fix case-changing merge bug
298
+
299
+ On a case insensitive filesystem, merge-recursive incorrectly
300
+ deleted the file that is to be renamed to a name that is the same
301
+ except for case differences.
302
+
303
+ Will merge to 'next' and keep it there for the rest of this cycle.
304
+
305
+
306
+* ew/config-protect-mode (2014-05-06) 1 commit
307
+ (merged to 'next' on 2014-05-07 at 8443093)
308
+ + config: preserve config file permissions on edits
309
+
310
+ Will keep in 'next' for the remainder of the cycle.
311
+
312
+
313
+* fc/rerere-conflict-style (2014-04-30) 1 commit
314
+ (merged to 'next' on 2014-05-07 at bde7fd0)
315
+ + rerere: fix for merge.conflictstyle
316
+
317
+ Will keep in 'next' for the remainder of the cycle.
318
+
319
+
320
+* jc/coding-guidelines (2014-05-02) 8 commits
321
+ - CodingGuidelines: on splitting a long line
322
+ - CodingGuidelines: on comparison
323
+ - CodingGuidelines: do not call the conditional statement "if()"
324
+ - CodingGuidelines: give an example for shell function preamble
325
+ - CodingGuidelines: give an example for control statements
326
+ - CodingGuidelines: give an example for redirection
327
+ - CodingGuidelines: give an example for case/esac statement
328
+ - CodingGuidelines: once it is in, it is not worth the code churn
329
+
330
+ Will merge to 'next' and keep it there for the rest of this cycle.
331
+
332
+
333
+* jd/subtree (2014-05-06) 5 commits
334
+ (merged to 'next' on 2014-05-07 at 81b375d)
335
+ + contrib/subtree/Makefile: clean up rule for "clean"
336
+ + contrib/subtree/Makefile: clean up rules to generate documentation
337
+ + contrib/subtree/Makefile: s/libexecdir/gitexecdir/
338
+ + contrib/subtree/Makefile: use GIT-VERSION-FILE
339
+ + contrib/subtree/Makefile: scrap unused $(gitdir)
340
+
341
+ Will keep in 'next' for the remainder of the cycle.
342
+
343
+
344
+* jk/commit-date-approxidate (2014-05-02) 4 commits
345
+ (merged to 'next' on 2014-05-07 at 7ec8f7d)
346
+ + commit: accept more date formats for "--date"
347
+ + commit: print "Date" line when the user has set date
348
+ + pretty: make show_ident_date public
349
+ + commit: use split_ident_line to compare author/committer
350
+
351
+ Will keep in 'next' for the remainder of the cycle.
352
+
353
+
354
+* mm/pager-less-sans-S (2014-05-07) 1 commit
355
+ (merged to 'next' on 2014-05-07 at 66ce999)
356
+ + pager: remove 'S' from $LESS by default
357
+
358
+ Will keep in 'next' for the remainder of the cycle.
359
+
360
+
361
+* sk/msvc-dynlink-crt (2014-05-06) 1 commit
362
+ (merged to 'next' on 2014-05-07 at 20f4839)
363
+ + MSVC: link dynamically to the CRT
364
+
365
+ Will keep in 'next' for the remainder of the cycle.
366
+
367
+
368
* cc/replace-edit (2014-04-29) 4 commits
369
- replace: add --edit option
370
- replace: factor object resolution out of replace_object
371
- replace: use OPT_CMDMODE to handle modes
372
- replace: refactor command-mode determination
373
374
+ "git replace" learns a new "--edit" option.
375
+
376
+ Will merge to 'next' and keep it there for the rest of this cycle.
377
+
378
379
* da/imap-send-use-credential-helper (2014-04-29) 1 commit
380
- imap-send: use git-credential
381
382
+ "git imap-send" learns to ask the credential helper for
383
+ authentication material.
384
+
385
+ Will merge to 'next' and keep it there for the rest of this cycle.
386
+
387
388
* dk/blame-reorg (2014-04-28) 1 commit
389
- blame: large-scale performance rewrite
390
391
+ I haven't found any "WAT" in my daily use, but I need to find time
392
+ to re-read the whole thing once again. After doing that, will
393
+ merge to 'next' and keep it there for the rest of this cycle.
394
+
395
396
* je/pager-do-not-recurse (2014-04-28) 1 commit
397
- pager: do allow spawning pager recursively
398
399
+ We used to unconditionally disabled the pager in the pager process
400
+ we spawn to feed out output, but that prevents people who want to
401
+ run less within less from doing so.
402
+
403
+ Will merge to 'next' and keep it there for the rest of this cycle.
404
+
405
406
* jk/commit-C-pick-empty (2014-04-28) 1 commit
407
- commit: do not complain of empty messages from -C
408
409
+ "git commit --allow-empty-message -C $commit" did not work when the
410
+ commit did not have any log message.
411
+
412
+ Will merge to 'next' and keep it there for the rest of this cycle.
413
+
414
415
* jk/utf8-switch-between-nfd-and-nfc (2014-04-29) 1 commit
416
- t3910: show failure of core.precomposeunicode with decomposed filenames
417
418
+ Document a known breakage with a test.
419
+
420
+ Will merge to 'next' and keep it there for the rest of this cycle.
421
+
422
423
* mt/send-email-cover-to-cc (2014-04-29) 2 commits
424
- test/send-email: to-cover, cc-cover tests
425
- git-send-email: two new options: to-cover, cc-cover
426
427
+ Will merge to 'next' and keep it there for the rest of this cycle.
428
+
429
430
* nd/split-index (2014-04-29) 33 commits
431
- SQUASH???
@@ -347,13 +462,24 @@ of the repositories listed at
462
- ewah: delete unused ewah_read_mmap_native declaration
463
- ewah: fix constness of ewah_read_mmap
464
465
+ The tip one is a reminder that needs to be squashed to squelch
466
+ a "may be unused" compilation warning that is a false positive.
467
+
468
469
* tl/relax-in-poll-emulation (2014-04-29) 1 commit
470
- compat/poll: sleep 1 millisecond to avoid busy wait
471
472
+ Will merge to 'next' and keep it there for the rest of this cycle.
473
+
474
+
475
+* bc/blame-crlf-test (2014-05-08) 1 commit
476
+ - blame: correctly handle files regardless of autocrlf
477
355
-* bc/blame-crlf-test (2014-04-28) 1 commit
356
- - blame: correctly handle files regardless of autocrlf.
478
+ If a file contained CRLF line endings in a repository with
479
+ core.autocrlf=input, then blame always marked lines as "Not
480
+ Committed Yet", even if they were unmodified.
481
+
482
+ Will merge to 'next' and keep it there for the rest of this cycle.
483
484
485
* rs/ref-transaction (2014-04-29) 27 commits
@@ -393,51 +519,52 @@ of the repositories listed at
519
520
521
* ep/shell-command-substitution (2014-04-30) 41 commits
396
- - t5000-tar-tree.sh: use the $( ... ) construct for command substitution
397
- - t4204-patch-id.sh: use the $( ... ) construct for command substitution
398
- - t4119-apply-config.sh: use the $( ... ) construct for command substitution
399
- - t4116-apply-reverse.sh: use the $( ... ) construct for command substitution
400
- - t4057-diff-combined-paths.sh: use the $( ... ) construct for command substitution
401
- - t4038-diff-combined.sh: use the $( ... ) construct for command substitution
402
- - t4036-format-patch-signer-mime.sh: use the $( ... ) construct for command substitution
403
- - t4014-format-patch.sh: use the $( ... ) construct for command substitution
404
- - t4013-diff-various.sh: use the $( ... ) construct for command substitution
405
- - t4012-diff-binary.sh: use the $( ... ) construct for command substitution
406
- - t4010-diff-pathspec.sh: use the $( ... ) construct for command substitution
407
- - t4006-diff-mode.sh: use the $( ... ) construct for command substitution
408
- - t3910-mac-os-precompose.sh: use the $( ... ) construct for command substitution
409
- - t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution
410
- - t1050-large.sh: use the $( ... ) construct for command substitution
411
- - t1020-subdirectory.sh: use the $( ... ) construct for command substitution
412
- - t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitution
413
- - t1003-read-tree-prefix.sh: use the $( ... ) construct for command substitution
414
- - t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitution
415
- - t1001-read-tree-m-2way.sh: use the $( ... ) construct for command substitution
416
- - t1000-read-tree-m-3way.sh: use the $( ... ) construct for command substitution
417
- - t0300-credentials.sh: use the $( ... ) construct for command substitution
418
- - t0030-stripspace.sh: use the $( ... ) construct for command substitution
419
- - t0026-eol-config.sh: use the $( ... ) construct for command substitution
420
- - t0025-crlf-auto.sh: use the $( ... ) construct for command substitution
421
- - t0020-crlf.sh: use the $( ... ) construct for command substitution
422
- - t0010-racy-git.sh: use the $( ... ) construct for command substitution
423
- - t0001-init.sh: use the $( ... ) construct for command substitution
424
- - p5302-pack-index.sh: use the $( ... ) construct for command substitution
425
- - lib-gpg.sh: use the $( ... ) construct for command substitution
426
- - lib-cvs.sh: use the $( ... ) construct for command substitution
427
- - lib-credential.sh: use the $( ... ) construct for command substitution
428
- - git-web--browse.sh: use the $( ... ) construct for command substitution
429
- - git-stash.sh: use the $( ... ) construct for command substitution
430
- - git-rebase.sh: use the $( ... ) construct for command substitution
431
- - git-rebase--merge.sh: use the $( ... ) construct for command substitution
432
- - git-pull.sh: use the $( ... ) construct for command substitution
433
- - appp.sh: use the $( ... ) construct for command substitution
434
- - t7900-subtree.sh: use the $( ... ) construct for command substitution
435
- - test-gitmw-lib.sh: use the $( ... ) construct for command substitution
436
- - t9365-continuing-queries.sh: use the $( ... ) construct for command substitution
522
+ (merged to 'next' on 2014-05-07 at e9952c7)
523
+ + t5000-tar-tree.sh: use the $( ... ) construct for command substitution
524
+ + t4204-patch-id.sh: use the $( ... ) construct for command substitution
525
+ + t4119-apply-config.sh: use the $( ... ) construct for command substitution
526
+ + t4116-apply-reverse.sh: use the $( ... ) construct for command substitution
527
+ + t4057-diff-combined-paths.sh: use the $( ... ) construct for command substitution
528
+ + t4038-diff-combined.sh: use the $( ... ) construct for command substitution
529
+ + t4036-format-patch-signer-mime.sh: use the $( ... ) construct for command substitution
530
+ + t4014-format-patch.sh: use the $( ... ) construct for command substitution
531
+ + t4013-diff-various.sh: use the $( ... ) construct for command substitution
532
+ + t4012-diff-binary.sh: use the $( ... ) construct for command substitution
533
+ + t4010-diff-pathspec.sh: use the $( ... ) construct for command substitution
534
+ + t4006-diff-mode.sh: use the $( ... ) construct for command substitution
535
+ + t3910-mac-os-precompose.sh: use the $( ... ) construct for command substitution
536
+ + t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution
537
+ + t1050-large.sh: use the $( ... ) construct for command substitution
538
+ + t1020-subdirectory.sh: use the $( ... ) construct for command substitution
539
+ + t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitution
540
+ + t1003-read-tree-prefix.sh: use the $( ... ) construct for command substitution
541
+ + t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitution
542
+ + t1001-read-tree-m-2way.sh: use the $( ... ) construct for command substitution
543
+ + t1000-read-tree-m-3way.sh: use the $( ... ) construct for command substitution
544
+ + t0300-credentials.sh: use the $( ... ) construct for command substitution
545
+ + t0030-stripspace.sh: use the $( ... ) construct for command substitution
546
+ + t0026-eol-config.sh: use the $( ... ) construct for command substitution
547
+ + t0025-crlf-auto.sh: use the $( ... ) construct for command substitution
548
+ + t0020-crlf.sh: use the $( ... ) construct for command substitution
549
+ + t0010-racy-git.sh: use the $( ... ) construct for command substitution
550
+ + t0001-init.sh: use the $( ... ) construct for command substitution
551
+ + p5302-pack-index.sh: use the $( ... ) construct for command substitution
552
+ + lib-gpg.sh: use the $( ... ) construct for command substitution
553
+ + lib-cvs.sh: use the $( ... ) construct for command substitution
554
+ + lib-credential.sh: use the $( ... ) construct for command substitution
555
+ + git-web--browse.sh: use the $( ... ) construct for command substitution
556
+ + git-stash.sh: use the $( ... ) construct for command substitution
557
+ + git-rebase.sh: use the $( ... ) construct for command substitution
558
+ + git-rebase--merge.sh: use the $( ... ) construct for command substitution
559
+ + git-pull.sh: use the $( ... ) construct for command substitution
560
+ + appp.sh: use the $( ... ) construct for command substitution
561
+ + t7900-subtree.sh: use the $( ... ) construct for command substitution
562
+ + test-gitmw-lib.sh: use the $( ... ) construct for command substitution
563
+ + t9365-continuing-queries.sh: use the $( ... ) construct for command substitution
564
565
Adjust shell scripts to use $(cmd) instead of `cmd`.
566
440
- Will merge to 'next' and keep it there for the remainder of the cycle.
567
+ Will keep in 'next' for the remainder of the cycle.
568
569
570
* ib/test-selectively-run (2014-05-06) 3 commits
@@ -478,15 +605,11 @@ of the repositories listed at
605
+ remote-helpers: move out of contrib
606
+ remote-helpers: squelch python import exceptions
607
481
- Move remote-hg and remote-bzr out of contrib/. There were some
482
- suggestions on the follow-up fix patches still not in 'next', which
483
- may result in a reroll.
484
-
485
- I tend to agree with John Keeping that remote helpers that are
486
- actively maintained can and should aim to graduate from my tree and
487
- given to the user directly.
488
-
489
- Will hold.
608
+ As there were announcements for these two to be maintained as
609
+ independent third-party projects ($gmane/248561, $gmane/248583),
610
+ this topic would need to be discarded after 2.0 final, and copies
611
+ in contrib/remote-helpers/ may need to be replaced with a README
612
+ with pointers to their canonical repository.
613
614
615
* fc/remote-helper-refmap (2014-04-21) 8 commits
@@ -724,7 +847,8 @@ of the repositories listed at
847
848
849
* mt/patch-id-stable (2014-05-06) 6 commits
727
- - test doc: test_write_lines does not split its arguments
850
+ (merged to 'next' on 2014-05-07 at 6ade68e)
851
+ + test doc: test_write_lines does not split its arguments
852
(merged to 'next' on 2014-05-02 at cfa251b)
853
+ t4204-patch-id.sh: default is now stable
854
+ patch-id: change default to stable
@@ -736,7 +860,7 @@ of the repositories listed at
860
Introduce a new way to compute patch-id for a patch that is not
861
affected by the order of the paths that appear in the input.
862
739
- Will merge to 'next' and keep it there for the remainder of the cycle.
863
+ Will keep in 'next' for the remainder of the cycle.
864
865
866
* mh/ref-transaction (2014-04-07) 27 commits
@@ -891,7 +1015,6 @@ of the repositories listed at
1015
A new filter to programatically edit the tail end of the commit log
1016
messages.
1017
894
-
1018
--------------------------------------------------
1019
[Discarded]
1020
@@ -904,5 +1027,3 @@ of the repositories listed at
1027
this, but it was easy enough to cobble together. Tests, docs and
1028
stripping out more MIMEy stuff are left as exercises to interested
1029
parties.
907
-
908
-