[ANNOUNCE] Cogito-0.11.3

  Hello,

  it turned out that Cogito was so broken w.r.t. three-way merging that
I had to really release a bugfix version. So this version contains some
cleanups of the merge script, some more portability fixes (it actually
runs on Debian old stable now!), and especially few bugfixes - cg-log
works with individual files passed to it now, and merging should
hopefully work correctly now too.

  You know what to do. :-)


Junio C Hamano:
  Add read-tree -m 3-way merge tests.

Linus Torvalds:
  One more time.. Clean up git-merge-one-file-script
  Fix up git-merge-one-file-script
  Merge my and Petr's git-merge-one-file-script modifications
  Make sure we error out if we can't remove a file on automatic merges.

Petr Baudis:
  cogito-0.11.3
  Fix cg-merge's three-way content merge
  Support for compilation w/o OpenSSL
  Portable stub for the stat call
  Fix cg-diff -p to work with no -r specified
  git-merge-one-file-script cleanups from Cogito
  Further converge git-merge-one-file-script and cg-Xmergefile
  Remove useless ret=0 in the onefile merge scripts
  Make git-merge-one-file-script and cg-Xmergefile converge even more
  Fix cg-log called on specified files
  Tidy up some rev-list-related stuff
  Fix git-merge-one-file permissions auto-merging

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
<Espy> be careful, some twit might quote you out of context..

Petr Baudis wrote:

  Hello,

  it turned out that Cogito was so broken w.r.t. three-way merging that
I had to really release a bugfix version. So this version contains some
cleanups of the merge script, some more portability fixes (it actually
runs on Debian old stable now!), and especially few bugfixes - cg-log
works with individual files passed to it now, and merging should
hopefully work correctly now too.

  You know what to do. :-)

Hi Petr,

I have updated to Cogito-0.11.3, it compiles and runs
but make test returns multiple error messages (see below)

Rgds,
Konstantin



*** t6001-rev-list-merge-order.sh ***
fatal: merge order sort unsupported, OpenSSL not linked
fatal: merge order sort unsupported, OpenSSL not linked
*   ok 1: Testing that the rev-list has correct number of entries
* FAIL 2: Testing that --merge-order produces the correct result diff
expected-merge-order actual-merge-order
*   ok 3: Testing that --merge-order produces as many or fewer
discontinuities
fatal: merge order sort unsupported, OpenSSL not linked
* FAIL 4: Testing multiple heads diff expected-merge-order-1
actual-merge-order-1
fatal: merge order sort unsupported, OpenSSL not linked
* FAIL 5: Testing stop diff expected-merge-order-2 actual-merge-order-2
fatal: merge order sort unsupported, OpenSSL not linked
* FAIL 6: Testing stop in linear epoch diff expected-merge-order-3
actual-merge-order-3
fatal: merge order sort unsupported, OpenSSL not linked
* FAIL 7: Testing start in linear epoch, stop after non-linear epoch
diff expected-merge-order-4 actual-merge-order-4
* FAIL 8: Testing duplicated start arguments diff expected-merge-order-4
actual-merge-order-5
* FAIL 9: Testing exclusion near merge git-rev-list --merge-order $a4
^$c3 2>/dev/null
* failed 7 among 9 test(s)
make[1]: *** [all] Error 1
make[1]: Leaving directory `/home/konstantin/git/cogito/t'
make: *** [test] Error 2

-- 
Konstantin Antselovich
mailto: konstantin@antselovich.com
http://konstantin.antselovich.com

Konstantin Antselovich wrote:

I have updated to Cogito-0.11.3, it compiles and runs
but make test returns multiple error messages (see below)

There's a typo in rev-list.c. This fixes the tests for me:

diff --git a/rev-list.c b/rev-list.c
--- a/rev-list.c
+++ b/rev-list.c

@@ -218,7 +218,7 @@ int main(int argc, char **argv)
                         list = limit_list(list);
                 show_commit_list(list);
         } else {
-#ifdef NO_OPENSSL
+#ifndef NO_OPENSSL
                 if (sort_list_in_merge_order(list, &process_commit)) {
                           die("merge order sort failed\n");
                 }

* Dan Holmsand (holmsand@gmail.com) wrote:

Konstantin Antselovich wrote:

quoted

I have updated to Cogito-0.11.3, it compiles and runs
but make test returns multiple error messages (see below)

There's a typo in rev-list.c. This fixes the tests for me:

This patch is white space damaged.  I fixed it, and added it to the
cogito-0.11.3 rpm.  Below is the refreshed patch.

thanks,
-chris
--

From: Dan Holmsand <redacted>

There's a typo in rev-list.c. This fixes the tests for me:

diff --git a/rev-list.c b/rev-list.c
--- a/rev-list.c
+++ b/rev-list.c

@@ -218,7 +218,7 @@ int main(int argc, char **argv)
 			list = limit_list(list);
 		show_commit_list(list);
 	} else {
-#ifdef NO_OPENSSL
+#ifndef NO_OPENSSL
 		if (sort_list_in_merge_order(list, &process_commit)) {
 			  die("merge order sort failed\n");
 		}

* Chris Wright (chrisw@osdl.org) wrote:

* Dan Holmsand (holmsand@gmail.com) wrote:

quoted

Konstantin Antselovich wrote:

quoted

I have updated to Cogito-0.11.3, it compiles and runs
but make test returns multiple error messages (see below)

There's a typo in rev-list.c. This fixes the tests for me:

This patch is white space damaged.  I fixed it, and added it to the
cogito-0.11.3 rpm.  Below is the refreshed patch.

Looks like showdate() is having some minor trouble.  A simple cg-log
gave me errors indicating the tz is being interpreted as octal.
There's probably a better way, but bruteforce works ;-) This patch is
in the RPM packages which are now uploading.

thanks,
-chris
--

Strip leading zero from timezone to keep it from being interpreted as
octal causing error such as:

/usr/lib/cogito/cg-Xlib: line 69: 0800: value too great for base (error token is "0800")

Signed-off-by: Chris Wright <redacted>

--- a/cg-Xlib
+++ b/cg-Xlib

@@ -65,7 +65,9 @@ showdate () {
 	[ "$format" ] || format=-R
 	sec=${date[0]}; tz=${date[1]}
 	if [ "$has_gnudate" ]; then
-	        dtz=${tz/+/}
+	        dtz=${tz/-0/-}
+	        dtz=${dtz/+/}
+	        dtz=${dtz/#0/}
 		lsec=$(($dtz / 100 * 3600 + $dtz % 100 * 60 + $sec))
 	        pdate="$(date -ud "1970-01-01 UTC + $lsec sec" "$format" 2>/dev/null)"
 	else