{"thread":{"id":"4249","subject":"cogito testsuite failure - git-read-tree too careful","startedAt":"2006-05-23T00:28:18Z","lastAt":"2006-05-23T00:28:18Z","messageCount":1,"participants":["Pavel Roskin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"20499","messageId":"1148344098.26251.57.camel@dv","threadId":"4249","inReplyTo":null,"subject":"cogito testsuite failure - git-read-tree too careful","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-05-23T00:28:18Z","receivedAt":"2006-05-23T00:28:18Z","isPatch":false,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Hello, Petr!\n\nThe testsuite for cogito fails in t9300-seek.sh for up-to-date master\nbranches of git and Cogito.\n\n$ ./t9300-seek.sh -v -i\n* expecting success: cg-seek cbd273f56aecaaf28b857ae74da77cbb11a4d659\nWarning: uncommitted local changes, trying to bring them along\nfatal: Entry 'newdir/newfile' not uptodate. Cannot merge.\ncg-seek: cbd273f56aecaaf28b857ae74da77cbb11a4d659: bad commit\n* FAIL 21: seeking to the first commit\n        cg-seek cbd273f56aecaaf28b857ae74da77cbb11a4d659\n\nAs I understand it, \"git-read-tree -m\" in cg-Xlib refuses to merge if\nthere are local changes.  This was likely caused by commit\nfcc387db9bc453dc7e07a262873481af2ee9e5c8:\n\nread-tree -m -u: do not overwrite or remove untracked working tree\nfiles.\n    \nI guess git-read-tree should be using \"--reset\" or something to restore\nthe original behavior.\n\nThe \"tutorial\" testsuite also fails:\n\nShould not be doing an Octopus.\nNo merge strategy handled the merge.\nMerging 5de8995e58b4b478dff476788c3607ed5021fc24 ->\nba8b9edd80500d60d68a6630ee415a3e710f6db2\n        to a60f36f73018dc1959d8d2cbd28271f93ee5f686 ...\nfatal: Untracked working tree file 'stack.h' would be overwritten by\nmerge.\ncg-merge: git-read-tree failed (merge likely blocked by local changes)\n162\n?\nUnexpected error 4 on line 242\n\nIn this case, we may want cg-merge to fail, because it's wrong to\noverwrite local files without backing them up.\n\n-- \nRegards,\nPavel Roskin\n"}]}