From: Linus Torvalds Date: Mon, 06 Jun 2005 07:03:09 GMT Subject: Re: Last mile for 1.0 Message-ID: In-Reply-To: <7vis0sugp7.fsf@assigned-by-dhcp.cox.net> On Sun, 5 Jun 2005, Junio C Hamano wrote: > > Is test 44 in t1000 (the first one in t1000 after the lib- > read-tree-m-3way prepares the test trees) good enough? Or do > you want more specific tests to make sure the logic catches > individual cases right? I was more thinking of all the individual cases, and also the 2-way merge issue (which _should_ be a lot easier, but hey, I had tons of bugs there too). For example, what should happen if you do a merge and you have a file in the index that isn't mentioned by any of the trees involved. I consider that a failure, since the merge will remove the file, and since it wasn't committed, it's now a "data lost" issue. But did I actually get it right? I have no idea. Linus