{"thread":{"id":"874","subject":"[ANNOUNCE] Cogito-0.11.3","startedAt":"2005-06-09T09:19:09Z","lastAt":"2005-06-09T21:06:41Z","messageCount":5,"participants":["Petr Baudis","Konstantin Antselovich","Dan Holmsand","Chris Wright"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"4764","messageId":"20050609091909.GF29665@pasky.ji.cz","threadId":"874","inReplyTo":null,"subject":"[ANNOUNCE] Cogito-0.11.3","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-06-09T09:19:09Z","receivedAt":"2005-06-09T09:19:09Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"  Hello,\n\n  it turned out that Cogito was so broken w.r.t. three-way merging that\nI had to really release a bugfix version. So this version contains some\ncleanups of the merge script, some more portability fixes (it actually\nruns on Debian old stable now!), and especially few bugfixes - cg-log\nworks with individual files passed to it now, and merging should\nhopefully work correctly now too.\n\n  You know what to do. :-)\n\n\nJunio C Hamano:\n  Add read-tree -m 3-way merge tests.\n\nLinus Torvalds:\n  One more time.. Clean up git-merge-one-file-script\n  Fix up git-merge-one-file-script\n  Merge my and Petr's git-merge-one-file-script modifications\n  Make sure we error out if we can't remove a file on automatic merges.\n\nPetr Baudis:\n  cogito-0.11.3\n  Fix cg-merge's three-way content merge\n  Support for compilation w/o OpenSSL\n  Portable stub for the stat call\n  Fix cg-diff -p to work with no -r specified\n  git-merge-one-file-script cleanups from Cogito\n  Further converge git-merge-one-file-script and cg-Xmergefile\n  Remove useless ret=0 in the onefile merge scripts\n  Make git-merge-one-file-script and cg-Xmergefile converge even more\n  Fix cg-log called on specified files\n  Tidy up some rev-list-related stuff\n  Fix git-merge-one-file permissions auto-merging\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\n<Espy> be careful, some twit might quote you out of context..\n"},{"id":"4773","messageId":"42A81584.90605@antselovich.com","threadId":"874","inReplyTo":"20050609091909.GF29665@pasky.ji.cz","subject":"Re: [ANNOUNCE] Cogito-0.11.3","fromName":"Konstantin Antselovich","fromEmail":"konstantin@antselovich.com","sentAt":"2005-06-09T10:10:12Z","receivedAt":"2005-06-09T10:10:12Z","isPatch":false,"sender":{"key":"konstantin@antselovich.com","avatar":null},"body":"Petr Baudis wrote:\n>   Hello,\n> \n>   it turned out that Cogito was so broken w.r.t. three-way merging that\n> I had to really release a bugfix version. So this version contains some\n> cleanups of the merge script, some more portability fixes (it actually\n> runs on Debian old stable now!), and especially few bugfixes - cg-log\n> works with individual files passed to it now, and merging should\n> hopefully work correctly now too.\n> \n>   You know what to do. :-)\n\nHi Petr,\n\nI have updated to Cogito-0.11.3, it compiles and runs\nbut make test returns multiple error messages (see below)\n\nRgds,\nKonstantin\n\n\n\n*** t6001-rev-list-merge-order.sh ***\nfatal: merge order sort unsupported, OpenSSL not linked\nfatal: merge order sort unsupported, OpenSSL not linked\n*   ok 1: Testing that the rev-list has correct number of entries\n* FAIL 2: Testing that --merge-order produces the correct result diff\nexpected-merge-order actual-merge-order\n*   ok 3: Testing that --merge-order produces as many or fewer\ndiscontinuities\nfatal: merge order sort unsupported, OpenSSL not linked\n* FAIL 4: Testing multiple heads diff expected-merge-order-1\nactual-merge-order-1\nfatal: merge order sort unsupported, OpenSSL not linked\n* FAIL 5: Testing stop diff expected-merge-order-2 actual-merge-order-2\nfatal: merge order sort unsupported, OpenSSL not linked\n* FAIL 6: Testing stop in linear epoch diff expected-merge-order-3\nactual-merge-order-3\nfatal: merge order sort unsupported, OpenSSL not linked\n* FAIL 7: Testing start in linear epoch, stop after non-linear epoch\ndiff expected-merge-order-4 actual-merge-order-4\n* FAIL 8: Testing duplicated start arguments diff expected-merge-order-4\nactual-merge-order-5\n* FAIL 9: Testing exclusion near merge git-rev-list --merge-order $a4\n^$c3 2>/dev/null\n* failed 7 among 9 test(s)\nmake[1]: *** [all] Error 1\nmake[1]: Leaving directory `/home/konstantin/git/cogito/t'\nmake: *** [test] Error 2\n\n\n\n> \n\n\n-- \nKonstantin Antselovich\nmailto: konstantin@antselovich.com\nhttp://konstantin.antselovich.com\n"},{"id":"4784","messageId":"42A83F0C.5020809@gmail.com","threadId":"874","inReplyTo":"42A81584.90605@antselovich.com","subject":"Re: [ANNOUNCE] Cogito-0.11.3","fromName":"Dan Holmsand","fromEmail":"holmsand@gmail.com","sentAt":"2005-06-09T13:07:24Z","receivedAt":"2005-06-09T13:07:24Z","isPatch":false,"sender":{"key":"holmsand@gmail.com","avatar":"https://gravatar.com/avatar/5c722084bafd85e754a02efad01fe69107eb6f393253c49232c5c9f7faa974df?d=mp&s=160"},"body":"Konstantin Antselovich wrote:\n> I have updated to Cogito-0.11.3, it compiles and runs\n> but make test returns multiple error messages (see below)\n\nThere's a typo in rev-list.c. This fixes the tests for me:\n\ndiff --git a/rev-list.c b/rev-list.c\n--- a/rev-list.c\n+++ b/rev-list.c\n@@ -218,7 +218,7 @@ int main(int argc, char **argv)\n                         list = limit_list(list);\n                 show_commit_list(list);\n         } else {\n-#ifdef NO_OPENSSL\n+#ifndef NO_OPENSSL\n                 if (sort_list_in_merge_order(list, &process_commit)) {\n                           die(\"merge order sort failed\\n\");\n                 }\n\n"},{"id":"4803","messageId":"20050609205503.GJ5324@shell0.pdx.osdl.net","threadId":"874","inReplyTo":"42A83F0C.5020809@gmail.com","subject":"Re: [ANNOUNCE] Cogito-0.11.3","fromName":"Chris Wright","fromEmail":"chrisw@osdl.org","sentAt":"2005-06-09T20:55:03Z","receivedAt":"2005-06-09T20:55:03Z","isPatch":false,"sender":{"key":"chrisw@sous-sol.org","avatar":null},"body":"* Dan Holmsand (holmsand@gmail.com) wrote:\n> Konstantin Antselovich wrote:\n> >I have updated to Cogito-0.11.3, it compiles and runs\n> >but make test returns multiple error messages (see below)\n> \n> There's a typo in rev-list.c. This fixes the tests for me:\n\nThis patch is white space damaged.  I fixed it, and added it to the\ncogito-0.11.3 rpm.  Below is the refreshed patch.\n\nthanks,\n-chris\n--\n\nFrom: Dan Holmsand <holmsand@gmail.com>\n\nThere's a typo in rev-list.c. This fixes the tests for me:\n\ndiff --git a/rev-list.c b/rev-list.c\n--- a/rev-list.c\n+++ b/rev-list.c\n@@ -218,7 +218,7 @@ int main(int argc, char **argv)\n \t\t\tlist = limit_list(list);\n \t\tshow_commit_list(list);\n \t} else {\n-#ifdef NO_OPENSSL\n+#ifndef NO_OPENSSL\n \t\tif (sort_list_in_merge_order(list, &process_commit)) {\n \t\t\t  die(\"merge order sort failed\\n\");\n \t\t}\n"},{"id":"4804","messageId":"20050609210641.GK5324@shell0.pdx.osdl.net","threadId":"874","inReplyTo":"20050609205503.GJ5324@shell0.pdx.osdl.net","subject":"Re: [ANNOUNCE] Cogito-0.11.3","fromName":"Chris Wright","fromEmail":"chrisw@osdl.org","sentAt":"2005-06-09T21:06:41Z","receivedAt":"2005-06-09T21:06:41Z","isPatch":false,"sender":{"key":"chrisw@sous-sol.org","avatar":null},"body":"* Chris Wright (chrisw@osdl.org) wrote:\n> * Dan Holmsand (holmsand@gmail.com) wrote:\n> > Konstantin Antselovich wrote:\n> > >I have updated to Cogito-0.11.3, it compiles and runs\n> > >but make test returns multiple error messages (see below)\n> > \n> > There's a typo in rev-list.c. This fixes the tests for me:\n> \n> This patch is white space damaged.  I fixed it, and added it to the\n> cogito-0.11.3 rpm.  Below is the refreshed patch.\n\nLooks like showdate() is having some minor trouble.  A simple cg-log\ngave me errors indicating the tz is being interpreted as octal.\nThere's probably a better way, but bruteforce works ;-) This patch is\nin the RPM packages which are now uploading.\n\nthanks,\n-chris\n--\n\nStrip leading zero from timezone to keep it from being interpreted as\noctal causing error such as:\n\n/usr/lib/cogito/cg-Xlib: line 69: 0800: value too great for base (error token is \"0800\")\n\nSigned-off-by: Chris Wright <chrisw@osdl.org>\n\n--- a/cg-Xlib\n+++ b/cg-Xlib\n@@ -65,7 +65,9 @@ showdate () {\n \t[ \"$format\" ] || format=-R\n \tsec=${date[0]}; tz=${date[1]}\n \tif [ \"$has_gnudate\" ]; then\n-\t        dtz=${tz/+/}\n+\t        dtz=${tz/-0/-}\n+\t        dtz=${dtz/+/}\n+\t        dtz=${dtz/#0/}\n \t\tlsec=$(($dtz / 100 * 3600 + $dtz % 100 * 60 + $sec))\n \t        pdate=\"$(date -ud \"1970-01-01 UTC + $lsec sec\" \"$format\" 2>/dev/null)\"\n \telse\n"}]}