kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
1,028 Commits
6 Branches
978 Tags
167 MiB
Commit Graph

3 Commits (d2775a817a19d966ec35a1da9440e2feb55276f4)

Author SHA1 Message Date
Junio C Hamano 1abb3f14c8 [PATCH] Add more tests for read-tree --emu23. 
This adds more tests for --emu23.  One is to show how it can
carry forward more local changes than the straightforward
two-way fast forward, and another is to show the recent
overeager optimization of directory/file conflict check broke
things, which will be fixed in the next commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2005-06-25 16:52:16 -07:00
Junio C Hamano 76bc82ca0e [PATCH] Clean up read-tree two-way tests. 
This is in preparation for "2-way fast-forward emulated with
3-way mechanism" series.  It does not change what the tests for
pure 2-way do.  It only changes how it tests things, to make
reviewing of differences of the two tests easier in later steps.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2005-06-12 20:40:20 -07:00
Junio C Hamano c859600954 [PATCH] read-tree: save more user hassles during fast-forward. 
This implements the "never lose the current cache information or
the work tree state, but favor a successful merge over merge
failure" principle in the fast-forward two-tree merge operation.

It comes with a set of tests to cover all the cases described in
the case matrix found in the new documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2005-06-07 11:41:51 -07:00