{"thread":{"id":"25515","subject":"[ANNOUNCE] Git 1.7.3.2","startedAt":"2010-10-22T04:13:29Z","lastAt":"2010-11-25T23:39:22Z","messageCount":6,"participants":["Junio C Hamano","Anders Kaseorg","Steven Walter","Eric Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"154094","messageId":"7vwrparhjq.fsf@alter.siamese.dyndns.org","threadId":"25515","inReplyTo":null,"subject":"[ANNOUNCE] Git 1.7.3.2","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-10-22T04:13:29Z","receivedAt":"2010-10-22T04:13:29Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"The latest maintenance release Git 1.7.3.2 is available at the\nusual places:\n\n http://www.kernel.org/pub/software/scm/git/\n\n git-1.7.3.2.tar.{gz,bz2}\t\t\t(source tarball)\n git-htmldocs-1.7.3.2.tar.{gz,bz2}\t\t(preformatted docs)\n git-manpages-1.7.3.2.tar.{gz,bz2}\t\t(preformatted docs)\n\nThe RPM binary packages for a few architectures are found in:\n\n RPMS/$arch/git-*-1.7.3.2-1.fc11.$arch.rpm\t(RPM)\n\nThis is primarily to push out many documentation fixes accumulated since\nthe 1.7.3.1 release.\n\n----------------------------------------------------------------\n\nChanges since v1.7.3.1 are as follows:\n\nAndreas Gruenbacher (1):\n Clarify and extend the \"git diff\" format documentation\n\nAntonio Ospite (1):\n t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'\n\nBert Wesarg (1):\n Documentation: update-index: -z applies also to --index-info\n\nBrandon Casey (1):\n diffcore-pickaxe.c: remove unnecessary curly braces\n\nCliff Frey (1):\n documentation: git-config minor cleanups\n\nElijah Newren (1):\n t3020 (ls-files-error-unmatch): remove stray '1' from end of file\n\nEric Wong (1):\n Documentation/git-svn: discourage \"noMetadata\"\n\nErik Faye-Lund (1):\n do not depend on signed integer overflow\n\nJohannes Schindelin (2):\n Make sure that git_getpass() never returns NULL\n Fix typo in pack-objects' usage\n\nJon Seymour (1):\n stash: simplify parsing fixes\n\nJonathan Nieder (10):\n t0004 (unwritable files): simplify error handling\n environment.c: remove unused variable\n setup: make sure git dir path is in a permanent buffer\n init: plug tiny one-time memory leak\n xdiff: cast arguments for ctype functions to unsigned char\n Documentation: No argument of ALLOC_GROW should have side-effects\n Documentation: gitrevisions is in section 7\n Documentation: diff can compare blobs\n Documentation: expand 'git diff' SEE ALSO section\n Documentation: update implicit \"--no-index\" behavior in \"git diff\"\n\nJunio C Hamano (4):\n MinGW: avoid collisions between \"tags\" and \"TAGS\"\n CodingGuidelines: reword parameter expansion section\n shell portability: no \"export VAR=VAL\"\n Git 1.7.3.2\n\nKevin Ballard (1):\n Update test script annotate-tests.sh to handle missing/extra authors\n\nKirill Smelkov (1):\n user-manual: be consistent in illustrations to 'git rebase'\n\nMathias Lafeldt (1):\n git-svn: fix processing of decorated commit hashes\n\nMatthieu Moy (1):\n diff: trivial fix for --output file error message\n\nMichael J Gruber (4):\n remote-helpers: build in platform independent directory\n user-manual: fix anchor name Finding-comments-With-given-Content\n rev-list-options: clarify --parents and --children\n git-show-ref.txt: clarify the pattern matching\n\nRamkumar Ramachandra (1):\n SubmittingPatches: Document some extra tags used in commit messages\n\nRené Scharfe (1):\n work around buggy S_ISxxx(m) implementations\n\nSteven Walter (1):\n git-svn: check_cherry_pick should exclude commits already in our history\n\nTony Luck (1):\n Better advice on using topic branches for kernel development\n\nUwe Kleine-König (1):\n Documentation/git-clone: describe --mirror more verbosely\n\nYann Dirson (1):\n t/t3415: use && where applicable.\n\nŠtěpán Němec (6):\n Use angles for placeholders consistently\n Fix odd markup in --diff-filter documentation\n Use parentheses and `...' where appropriate\n Remove stray quotes in --pretty and --format documentation\n Put a space between `<' and argument in pack-objects usage string\n Fix {update,checkout}-index usage strings\n"},{"id":"154125","messageId":"1287737937.3785.15.camel@balanced-tree","threadId":"25515","inReplyTo":"7vwrparhjq.fsf@alter.siamese.dyndns.org","subject":"Test failure with old svn [Re: [ANNOUNCE] Git 1.7.3.2]","fromName":"Anders Kaseorg","fromEmail":"andersk@mit.edu","sentAt":"2010-10-22T08:58:57Z","receivedAt":"2010-10-22T08:58:57Z","isPatch":false,"sender":{"key":"andersk@mit.edu","avatar":"https://avatars.githubusercontent.com/u/26471?v=4"},"body":"On Thu, 2010-10-21 at 21:13 -0700, Junio C Hamano wrote:\n> Steven Walter (1):\n> git-svn: check_cherry_pick should exclude commits already in our history\n\nThe new test in this commit fails with Subversion 1.4 and below (for\nexample, on Ubuntu 6.06 and 8.04), where ‘svn merge’ required at least\ntwo arguments. I’m guessing that with Subversion < 1.5, the test\ndoesn’t make sense and should just be skipped.\n\nAnders\n\n\n*** t9157-git-svn-fetch-merge.sh ***\nInitialized empty Git repository in /build/buildd/git-1.7.3.2/t/trash directory.t9157-git-svn-fetch-merge/.git/\nexpecting success: \n\tsvn_cmd mkdir -m x \"$svnrepo\"/trunk &&\n\tsvn_cmd mkdir -m x \"$svnrepo\"/branches &&\n\tsvn_cmd co \"$svnrepo\"/trunk \"$SVN_TREE\" &&\n\t(\n\t\tcd \"$SVN_TREE\" &&\n\t\ttouch foo &&\n\t\tsvn add foo &&\n\t\tsvn commit -m \"initial commit\" &&\n\t\tsvn cp -m branch \"$svnrepo\"/trunk \"$svnrepo\"/branches/branch1 &&\n\t\ttouch bar &&\n\t\tsvn add bar &&\n\t\tsvn commit -m x &&\n\t\tsvn cp -m branch \"$svnrepo\"/trunk \"$svnrepo\"/branches/branch2 &&\n\t\tsvn switch \"$svnrepo\"/branches/branch1 &&\n\t\ttouch baz &&\n\t\tsvn add baz &&\n\t\tsvn commit -m x &&\n\t\tsvn switch \"$svnrepo\"/trunk &&\n\t\tsvn merge \"$svnrepo\"/branches/branch1 &&\n\t\tsvn commit -m \"merge\" &&\n\t\tsvn switch \"$svnrepo\"/branches/branch1 &&\n\t\tsvn commit -m x &&\n\t\tsvn switch \"$svnrepo\"/branches/branch2 &&\n\t\tsvn merge \"$svnrepo\"/branches/branch1 &&\n\t\tsvn commit -m \"merge branch1\" &&\n\t\tsvn switch \"$svnrepo\"/trunk &&\n\t\tsvn merge \"$svnrepo\"/branches/branch2 &&\n\t\tsvn resolved baz &&\n\t\tsvn commit -m \"merge branch2\"\n\t) &&\n\trm -rf \"$SVN_TREE\"\n\trm -rf \"$SVN_TREE\"\n\n\nCommitted revision 1.\n\nCommitted revision 2.\nChecked out revision 2.\nA foo\nAdding foo\nTransmitting file data .\nCommitted revision 3.\n\nCommitted revision 4.\nA bar\nAdding bar\nTransmitting file data .\nCommitted revision 5.\n\nCommitted revision 6.\nD bar\nUpdated to revision 6.\nA baz\nAdding baz\nTransmitting file data .\nCommitted revision 7.\nD baz\nA bar\nUpdated to revision 7.\nsvn: Not enough arguments provided; try 'svn help' for more info\nnot ok - 1 initialize source svn repo\n"},{"id":"154228","messageId":"1287798958-22549-1-git-send-email-stevenrwalter@gmail.com","threadId":"25515","inReplyTo":"1287737937.3785.15.camel@balanced-tree","subject":"[PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5","fromName":"Steven Walter","fromEmail":"stevenrwalter@gmail.com","sentAt":"2010-10-23T01:55:58Z","receivedAt":"2010-10-23T01:55:58Z","isPatch":true,"sender":{"key":"stevenrwalter@gmail.com","avatar":"https://avatars.githubusercontent.com/u/79127?v=4"},"body":"Specify a revision range to \"merge\" and manually set the svn:mergeinfo\nproperty.\n---\n t/t9157-git-svn-fetch-merge.sh | 10 +++++++---\n 1 files changed, 7 insertions(+), 3 deletions(-)\n\ndiff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh\nindex da582c5..424e1fa 100755\n--- a/t/t9157-git-svn-fetch-merge.sh\n+++ b/t/t9157-git-svn-fetch-merge.sh\n@@ -25,15 +25,19 @@ test_expect_success 'initialize source svn repo' '\n \t\tsvn add baz &&\n \t\tsvn commit -m x &&\n \t\tsvn switch \"$svnrepo\"/trunk &&\n-\t\tsvn merge \"$svnrepo\"/branches/branch1 &&\n+\t\tsvn merge -r3:7 \"$svnrepo\"/branches/branch1 &&\n+\t\tsvn propset svn:mergeinfo \"/branches/branch1:4-7\" . &&\n \t\tsvn commit -m \"merge\" &&\n \t\tsvn switch \"$svnrepo\"/branches/branch1 &&\n \t\tsvn commit -m x &&\n \t\tsvn switch \"$svnrepo\"/branches/branch2 &&\n-\t\tsvn merge \"$svnrepo\"/branches/branch1 &&\n+\t\tsvn merge -r3:8 \"$svnrepo\"/branches/branch1 &&\n+\t\tsvn propset svn:mergeinfo \"/branches/branch1:4-8\" . &&\n \t\tsvn commit -m \"merge branch1\" &&\n \t\tsvn switch \"$svnrepo\"/trunk &&\n-\t\tsvn merge \"$svnrepo\"/branches/branch2 &&\n+\t\tsvn merge -r5:9 \"$svnrepo\"/branches/branch2 &&\n+\t\tsvn propset svn:mergeinfo \"/branches/branch1:4-8\n+/branches/branch2:6-9\" . &&\n \t\tsvn resolved baz &&\n \t\tsvn commit -m \"merge branch2\"\n \t) &&\n-- \n1.6.3.3\n"},{"id":"156140","messageId":"alpine.DEB.2.02.1011181606340.14285@dr-wily.mit.edu","threadId":"25515","inReplyTo":"1287798958-22549-1-git-send-email-stevenrwalter@gmail.com","subject":"Re: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5","fromName":"Anders Kaseorg","fromEmail":"andersk@mit.edu","sentAt":"2010-11-18T21:15:59Z","receivedAt":"2010-11-18T21:15:59Z","isPatch":true,"sender":{"key":"andersk@mit.edu","avatar":"https://avatars.githubusercontent.com/u/26471?v=4"},"body":"Junio: Did this get lost? It fixes a test suite regression between \nv1.7.3.1 and v1.7.3.2 on systems with Subversion 1.4.\n\nSteven: Can you sign off on your commit?\n\nAnders\n\nOn Fri, 22 Oct 2010, Steven Walter wrote:\n\n> Specify a revision range to \"merge\" and manually set the svn:mergeinfo\n> property.\n> ---\n> t/t9157-git-svn-fetch-merge.sh | 10 +++++++---\n> 1 files changed, 7 insertions(+), 3 deletions(-)\n> \n> diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh\n> index da582c5..424e1fa 100755\n> --- a/t/t9157-git-svn-fetch-merge.sh\n> +++ b/t/t9157-git-svn-fetch-merge.sh\n> @@ -25,15 +25,19 @@ test_expect_success 'initialize source svn repo' '\n> \t\tsvn add baz &&\n> \t\tsvn commit -m x &&\n> \t\tsvn switch \"$svnrepo\"/trunk &&\n> -\t\tsvn merge \"$svnrepo\"/branches/branch1 &&\n> +\t\tsvn merge -r3:7 \"$svnrepo\"/branches/branch1 &&\n> +\t\tsvn propset svn:mergeinfo \"/branches/branch1:4-7\" . &&\n> \t\tsvn commit -m \"merge\" &&\n> \t\tsvn switch \"$svnrepo\"/branches/branch1 &&\n> \t\tsvn commit -m x &&\n> \t\tsvn switch \"$svnrepo\"/branches/branch2 &&\n> -\t\tsvn merge \"$svnrepo\"/branches/branch1 &&\n> +\t\tsvn merge -r3:8 \"$svnrepo\"/branches/branch1 &&\n> +\t\tsvn propset svn:mergeinfo \"/branches/branch1:4-8\" . &&\n> \t\tsvn commit -m \"merge branch1\" &&\n> \t\tsvn switch \"$svnrepo\"/trunk &&\n> -\t\tsvn merge \"$svnrepo\"/branches/branch2 &&\n> +\t\tsvn merge -r5:9 \"$svnrepo\"/branches/branch2 &&\n> +\t\tsvn propset svn:mergeinfo \"/branches/branch1:4-8\n> +/branches/branch2:6-9\" . &&\n> \t\tsvn resolved baz &&\n> \t\tsvn commit -m \"merge branch2\"\n> \t) &&\n> -- \n> 1.6.3.3\n> \n> \n"},{"id":"156144","messageId":"alpine.DEB.2.02.1011181826560.14285@dr-wily.mit.edu","threadId":"25515","inReplyTo":"alpine.DEB.2.02.1011181606340.14285@dr-wily.mit.edu","subject":"Re: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5","fromName":"Anders Kaseorg","fromEmail":"andersk@mit.edu","sentAt":"2010-11-18T23:35:11Z","receivedAt":"2010-11-18T23:35:11Z","isPatch":true,"sender":{"key":"andersk@mit.edu","avatar":"https://avatars.githubusercontent.com/u/26471?v=4"},"body":"On Thu, 18 Nov 2010, Anders Kaseorg wrote:\n> Junio: Did this get lost? It fixes a test suite regression between \n> v1.7.3.1 and v1.7.3.2 on systems with Subversion 1.4.\n\nHmm, perhaps I spoke too soon; when I actually run the patched test on an \nUbuntu 8.04 system, I still get a failure. Apparently Subversion 1.4 \nthinks the manually set svn:mergeinfo properties cause conflicts:\n\n+ svn merge -r5:9 file:///tmp/andersk/git/t/trash directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch2\nA baz\n C .\n+ svn propset svn:mergeinfo /branches/branch1:4-8\n/branches/branch2:6-9 .\nproperty 'svn:mergeinfo' set on '.'\n+ svn resolved baz\n+ svn commit -m merge branch2\nsvn: Commit failed (details follow):\nsvn: Aborting commit: '/tmp/andersk/git/t/trash directory.t9157-git-svn-fetch-merge/.git/svn/refs/remotes/git-svn/svn-tree' remains in conflict\n\nAnders\n"},{"id":"156573","messageId":"20101125233922.GA3317@dcvr.yhbt.net","threadId":"25515","inReplyTo":"alpine.DEB.2.02.1011181826560.14285@dr-wily.mit.edu","subject":"Re: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2010-11-25T23:39:22Z","receivedAt":"2010-11-25T23:39:22Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Anders Kaseorg wrote:\n> On Thu, 18 Nov 2010, Anders Kaseorg wrote:\n> > Junio: Did this get lost? It fixes a test suite regression between \n> > v1.7.3.1 and v1.7.3.2 on systems with Subversion 1.4.\n> \n> Hmm, perhaps I spoke too soon; when I actually run the patched test on an \n> Ubuntu 8.04 system, I still get a failure. Apparently Subversion 1.4 \n> thinks the manually set svn:mergeinfo properties cause conflicts:\n\nPerhaps the test (and feature) should just be disabled with older SVN?\n\n-- \nEric Wong\n"}]}