📄 diff-diff3-test.c
字号:
"Bb\n"
"Cc\n",
"--- foo3" APR_EOL_STR
"+++ bar3" APR_EOL_STR
"@@ -0,0 +1,3 @@" APR_EOL_STR
"+Aa\n"
"+Bb\n"
"+Cc\n",
pool));
return SVN_NO_ERROR;
}
static svn_error_t *
test_two_way_unified (const char **msg,
svn_boolean_t msg_only,
apr_pool_t *pool)
{
*msg = "2-way unified diff and trivial merge";
if (msg_only)
return SVN_NO_ERROR;
SVN_ERR (two_way_diff ("foo4", "bar4",
"Aa\n",
"Aa\n"
"Bb\n"
"Cc\n",
"--- foo4" APR_EOL_STR
"+++ bar4" APR_EOL_STR
"@@ -1 +1,3 @@" APR_EOL_STR
" Aa\n"
"+Bb\n"
"+Cc\n",
pool));
SVN_ERR (two_way_diff ("foo4b", "bar4b",
"Cc\n",
"Aa\n"
"Bb\n"
"Cc\n",
"--- foo4b" APR_EOL_STR
"+++ bar4b" APR_EOL_STR
"@@ -1 +1,3 @@" APR_EOL_STR
"+Aa\n"
"+Bb\n"
" Cc\n",
pool));
SVN_ERR (two_way_diff ("foo5", "bar5",
"Aa\n"
"Bb\n"
"Cc\n",
"Aa\n",
"--- foo5" APR_EOL_STR
"+++ bar5" APR_EOL_STR
"@@ -1,3 +1 @@" APR_EOL_STR
" Aa\n"
"-Bb\n"
"-Cc\n",
pool));
SVN_ERR (two_way_diff ("foo5b", "bar5b",
"Aa\n"
"Bb\n"
"Cc\n",
"Cc\n",
"--- foo5b" APR_EOL_STR
"+++ bar5b" APR_EOL_STR
"@@ -1,3 +1 @@" APR_EOL_STR
"-Aa\n"
"-Bb\n"
" Cc\n",
pool));
SVN_ERR (two_way_diff ("foo6", "bar6",
"Aa\n"
"Bb\n"
"Cc\n",
"Aa\n"
"Bb\n"
"Cc\n",
"",
pool));
SVN_ERR (two_way_diff ("foo6b", "bar6b",
"Aa\n"
"Bb\n"
"Cc\n",
"Aa\n"
"Xx\n"
"Cc\n",
"--- foo6b" APR_EOL_STR
"+++ bar6b" APR_EOL_STR
"@@ -1,3 +1,3 @@" APR_EOL_STR
" Aa\n"
"-Bb\n"
"+Xx\n"
" Cc\n",
pool));
SVN_ERR (two_way_diff ("foo6c", "bar6c",
"Aa\r\n"
"Bb\r\n"
"Cc\r\n",
"Aa\r\n"
"Xx\r\n"
"Cc\r\n",
"--- foo6c" APR_EOL_STR
"+++ bar6c" APR_EOL_STR
"@@ -1,3 +1,3 @@" APR_EOL_STR
" Aa\r\n"
"-Bb\r\n"
"+Xx\r\n"
" Cc\r\n",
pool));
SVN_ERR (two_way_diff ("foo7", "bar7",
"Aa\n",
"Bb\n",
"--- foo7" APR_EOL_STR
"+++ bar7" APR_EOL_STR
"@@ -1 +1 @@" APR_EOL_STR
"-Aa\n"
"+Bb\n",
pool));
SVN_ERR (two_way_diff ("foo7a", "bar7a",
"Aa\n"
"Cc\n",
"Bb\n"
"Cc\n",
"--- foo7a" APR_EOL_STR
"+++ bar7a" APR_EOL_STR
"@@ -1,2 +1,2 @@" APR_EOL_STR
"-Aa\n"
"+Bb\n"
" Cc\n",
pool));
SVN_ERR (two_way_diff ("foo8", "bar8",
"Aa\n"
"Bb\n"
"Cc\n",
"Xx\n"
"Yy\n",
"--- foo8" APR_EOL_STR
"+++ bar8" APR_EOL_STR
"@@ -1,3 +1,2 @@" APR_EOL_STR
"-Aa\n"
"-Bb\n"
"-Cc\n"
"+Xx\n"
"+Yy\n",
pool));
SVN_ERR (two_way_diff ("foo9", "bar9",
"Aa\n"
"Bb\n"
"Cc\n",
"Bb\n",
"--- foo9" APR_EOL_STR
"+++ bar9" APR_EOL_STR
"@@ -1,3 +1 @@" APR_EOL_STR
"-Aa\n"
" Bb\n"
"-Cc\n",
pool));
SVN_ERR (two_way_diff ("foo10", "bar10",
"Aa\n"
"Bb\n"
"Cc",
"Aa\n"
"Xx\n"
"Yy\n",
"--- foo10" APR_EOL_STR
"+++ bar10" APR_EOL_STR
"@@ -1,3 +1,3 @@" APR_EOL_STR
" Aa\n"
"-Bb\n"
"-Cc" APR_EOL_STR
"\\ No newline at end of file" APR_EOL_STR
"+Xx\n"
"+Yy\n",
pool));
SVN_ERR (two_way_diff ("foo11", "bar11",
"Aa\n"
"Xx\n"
"Yy\n",
"Aa\n"
"Bb\n"
"Cc",
"--- foo11" APR_EOL_STR
"+++ bar11" APR_EOL_STR
"@@ -1,3 +1,3 @@" APR_EOL_STR
" Aa\n"
"-Xx\n"
"-Yy\n"
"+Bb\n"
"+Cc" APR_EOL_STR
"\\ No newline at end of file" APR_EOL_STR,
pool));
SVN_ERR (two_way_diff ("foo12", "bar12",
"Aa\n"
"Xx\n"
"Yy",
"Aa\n"
"Bb\n"
"Cc",
"--- foo12" APR_EOL_STR
"+++ bar12" APR_EOL_STR
"@@ -1,3 +1,3 @@" APR_EOL_STR
" Aa\n"
"-Xx\n"
"-Yy" APR_EOL_STR
"\\ No newline at end of file" APR_EOL_STR
"+Bb\n"
"+Cc" APR_EOL_STR
"\\ No newline at end of file" APR_EOL_STR,
pool));
SVN_ERR (two_way_diff ("foo13", "bar13",
"Aa\n"
"Bb\n"
"Cc\n"
"Dd\n"
"Ee\n"
"Ff\n"
"Gg\n",
"Xx\n"
"Aa\n"
"Bb\n"
"Cc\n"
"Dd\n"
"Ee\n"
"Ff\n"
"Gg\n"
"Yy\n",
"--- foo13" APR_EOL_STR
"+++ bar13" APR_EOL_STR
"@@ -1,3 +1,4 @@" APR_EOL_STR
"+Xx\n"
" Aa\n"
" Bb\n"
" Cc\n"
"@@ -5,3 +6,4 @@" APR_EOL_STR
" Ee\n"
" Ff\n"
" Gg\n"
"+Yy\n",
pool));
SVN_ERR (two_way_diff ("foo14", "bar14",
"Aa\n"
"Bb\n"
"Cc\n"
"Dd\n"
"Ee\n"
"Ff\n"
"Gg\n",
"Bb\n"
"Aa\n"
"Cc\n"
"Dd\n"
"Ee\n"
"Gg\n"
"Ff\n",
"--- foo14" APR_EOL_STR
"+++ bar14" APR_EOL_STR
"@@ -1,7 +1,7 @@" APR_EOL_STR
"+Bb\n"
" Aa\n"
"-Bb\n"
" Cc\n"
" Dd\n"
" Ee\n"
"+Gg\n"
" Ff\n"
"-Gg\n",
pool));
SVN_ERR (two_way_diff ("foo16", "bar16",
"Aa\n"
"\n"
"Cc\n",
"Aa\n"
"Bb\n"
"Cc\n",
"--- foo16" APR_EOL_STR
"+++ bar16" APR_EOL_STR
"@@ -1,3 +1,3 @@" APR_EOL_STR
" Aa\n"
"-\n"
"+Bb\n"
" Cc\n",
pool));
return SVN_NO_ERROR;
}
static svn_error_t *
test_two_way_unified_suspect (const char **msg,
svn_boolean_t msg_only,
apr_pool_t *pool)
{
*msg = "2-way unified diff where output is suspect";
if (msg_only)
return SVN_NO_ERROR;
SVN_ERR (two_way_diff ("foo15a", "bar15a",
"Aa\n"
"Bb\n"
"Cc\n"
"Dd\n"
"Ee\n"
"Ff\n"
"Gg\n"
"Hh\n"
"Ii\n",
"Aa\n"
"Bb\n"
"Cc\n"
"Dd\n"
"Ff\n"
"Gg\n"
"Hh\n"
"Ii\n",
"--- foo15a" APR_EOL_STR
"+++ bar15a" APR_EOL_STR
"@@ -2,7 +2,6 @@" APR_EOL_STR
" Bb\n"
" Cc\n"
" Dd\n"
"-Ee\n"
" Ff\n"
" Gg\n"
" Hh\n",
pool));
SVN_ERR (two_way_diff ("foo15b", "bar15b",
"Aa\n"
"Bb\n"
"Cc\n"
"Dd\n"
"Ee\n"
"Ff\n"
⌨️ 快捷键说明
复制代码
Ctrl + C
搜索代码
Ctrl + F
全屏模式
F11
切换主题
Ctrl + Shift + D
显示快捷键
?
增大字号
Ctrl + =
减小字号
Ctrl + -