X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=_src%2FTest%2Ftools%2FT_SyncFilesX%2FFiles%2FT_SyncFilesX_RootFolders_EchoAnswer.txt;h=297c01de20b9075922962650e6ac7787e79fb68f;hb=789b8160859f55b0be4b16cb2a92639ae41d3b51;hp=7260a97a2306b39090987a593d56a5552be2ff9e;hpb=b3a835050ab0797a5a3d94ba4e3b6a30670622ae;p=vbslib%2Fmain.git diff --git a/_src/Test/tools/T_SyncFilesX/Files/T_SyncFilesX_RootFolders_EchoAnswer.txt b/_src/Test/tools/T_SyncFilesX/Files/T_SyncFilesX_RootFolders_EchoAnswer.txt index 7260a97..297c01d 100644 --- a/_src/Test/tools/T_SyncFilesX/Files/T_SyncFilesX_RootFolders_EchoAnswer.txt +++ b/_src/Test/tools/T_SyncFilesX/Files/T_SyncFilesX_RootFolders_EchoAnswer.txt @@ -6,25 +6,25 @@ ¶‰E‚Ì‹L†‚̈Ӗ¡: [*]•ÏX [+]’ljÁ [-]íœ [.]•s•Ï [ ]•sÝ ¶‚̓x[ƒXA‰E‚̓[ƒN -1. +1. [101] ¡ƒx[ƒXibase_1j: "..\Project\Base\AA" ¡ƒ[ƒNiwork_1j: "..\Project\Work\A" 1. .!* UpdateWork.txt -2. +2. [202] ¡ƒx[ƒXibase_2j: "..\Project\Base\BB" ¡ƒ[ƒNiwork_2j: "..\Project\Work\B" 1. +=+ NewSame.txt ------------------------------------------------------------------------------- -1. * +1. [101] * ¡ƒx[ƒXibase_1j: "..\Project\Base\AA" ¡ƒ[ƒNiwork_1j: "..\Project\Work\A" -2. * +2. [202] * ¡ƒx[ƒXibase_2j: "..\Project\Base\BB" ¡ƒ[ƒNiwork_2j: "..\Project\Work\B" -91. ÄƒXƒLƒƒƒ“‚·‚é +91. ÄƒXƒLƒƒƒ“‚·‚é [Rescan] 93. ‚·‚ׂẴ[ƒNƒtƒ@ƒCƒ‹‚̈ꗗ‚ðƒtƒ@ƒCƒ‹‚ɏo—Í‚·‚é 99. I—¹ “¯Šú‚·‚éƒZƒbƒg‚̔ԍ† >1 @@ -32,27 +32,28 @@ %FullPath(..)%\_work\FilesB\Project - Synced ‘O‰ñƒRƒ~ƒbƒgŽž‚̃x[ƒX: "Base\AA" ‘O‰ñƒRƒ~ƒbƒgŽž‚̃[ƒN: "Work\A" -*:“¯Šú‚³‚ê‚Ä‚¢‚È‚¢ƒtƒ@ƒCƒ‹A=:–¢“¯Šú‚Ńy[ƒX‚ƃ[ƒN‚Ì“à—e‚ª“¯‚¶ ------------------------------------------------------------------------------- ¡ƒx[ƒXibase_1j: "..\Project\Base\AA" ¡ƒ[ƒNiwork_1j: "..\Project\Work\A" -1. .!* UpdateWork.txt +1. .!* UpdateWork.txt -91. ÄƒXƒLƒƒƒ“‚·‚é +91. ÄƒXƒLƒƒƒ“‚·‚é [Rescan] 92. ƒ‹[ƒgEƒtƒHƒ‹ƒ_[‚ðŠJ‚­ +93. ó‹µ‚𕪐͂·‚é [Analyze] +96. š Ž©“®ƒ}[ƒW‚µ‚ăRƒ~ƒbƒg‚·‚é [AutoMerge] 99. –ß‚é ”Ô† >1 ------------------------------------------------------------------------------- ƒx[ƒXF"%FullPath(..)%\_work\FilesB\Project\Base\AA\UpdateWork.txt" ƒ[ƒNF"%FullPath(..)%\_work\FilesB\Project\Work\A\UpdateWork.txt" -ƒx[ƒXEƒtƒ@ƒCƒ‹‚ƃ[ƒNEƒtƒ@ƒCƒ‹‚́u“¯‚¶“à—ev‚Å‚µ‚½ -Žè“®‚Å“¯Šú‚µ‚½‚çAƒRƒ~ƒbƒg‚µ‚Ä‚­‚¾‚³‚¢B +ƒx[ƒX ƒtƒ@ƒCƒ‹‚ƃ[ƒN ƒtƒ@ƒCƒ‹‚́u“¯‚¶“à—ev‚Å‚µ‚½B +ŽŸ‚̃ƒjƒ…[‚Ì 1.‚ÅŠJ‚­‚Q‚‚̃tƒ@ƒCƒ‹‚ðŽè“®‚Å“¯Šú‚µ‚½‚çAƒRƒ~ƒbƒg‚µ‚Ä‚­‚¾‚³‚¢B ------------------------------------------------------------------------------- šƒx[ƒXibase_1j: UpdateWork.txt (.•s•Ï) šƒ[ƒNiwork_1j: UpdateWork.txt (*•ÏX) 1. Diff ‚ÅŠJ‚­F“¯Šú‚·‚éƒtƒ@ƒCƒ‹ (!ˆÙ‚È‚é) [ ƒx[ƒX / ƒ[ƒN ] -2. Diff ‚ÅŠJ‚­F‘O‰ñ‚Ì“¯Šú (=“¯‚¶) [ ƒx[ƒX / ƒ[ƒN ] +2. Diff ‚ÅŠJ‚­F‘O‰ñƒRƒ~ƒbƒgŽž‚Ì“¯Šú“à—e (=“¯‚¶) [ ƒx[ƒX / ƒ[ƒN ] 4. Diff ‚ÅŠJ‚­Fƒx[ƒX (.•s•Ï) [ ‘O‰ñƒRƒ~ƒbƒgŽž / Œ»Ý ] 5. Diff ‚ÅŠJ‚­Fƒ[ƒN (*•ÏX) [ ‘O‰ñƒRƒ~ƒbƒgŽž / Œ»Ý ] 44.Diff ‚ÅŠJ‚­F[ ‘O‰ñƒRƒ~ƒbƒgŽž‚̃x[ƒX / ƒx[ƒX / ƒ[ƒN ] @@ -66,25 +67,26 @@ Enter %FullPath(..)%\_work\FilesB\Project - Synced ‘O‰ñƒRƒ~ƒbƒgŽž‚̃x[ƒX: "Base\AA" ‘O‰ñƒRƒ~ƒbƒgŽž‚̃[ƒN: "Work\A" -*:“¯Šú‚³‚ê‚Ä‚¢‚È‚¢ƒtƒ@ƒCƒ‹A=:–¢“¯Šú‚Ńy[ƒX‚ƃ[ƒN‚Ì“à—e‚ª“¯‚¶ ------------------------------------------------------------------------------- ¡ƒx[ƒXibase_1j: "..\Project\Base\AA" ¡ƒ[ƒNiwork_1j: "..\Project\Work\A" -1. .!* UpdateWork.txt +1. .!* UpdateWork.txt -91. ÄƒXƒLƒƒƒ“‚·‚é +91. ÄƒXƒLƒƒƒ“‚·‚é [Rescan] 92. ƒ‹[ƒgEƒtƒHƒ‹ƒ_[‚ðŠJ‚­ +93. ó‹µ‚𕪐͂·‚é [Analyze] +96. š Ž©“®ƒ}[ƒW‚µ‚ăRƒ~ƒbƒg‚·‚é [AutoMerge] 99. –ß‚é ”Ô† >99 ------------------------------------------------------------------------------- -1. * +1. [101] * ¡ƒx[ƒXibase_1j: "..\Project\Base\AA" ¡ƒ[ƒNiwork_1j: "..\Project\Work\A" -2. * +2. [202] * ¡ƒx[ƒXibase_2j: "..\Project\Base\BB" ¡ƒ[ƒNiwork_2j: "..\Project\Work\B" -91. ÄƒXƒLƒƒƒ“‚·‚é +91. ÄƒXƒLƒƒƒ“‚·‚é [Rescan] 93. ‚·‚ׂẴ[ƒNƒtƒ@ƒCƒ‹‚̈ꗗ‚ðƒtƒ@ƒCƒ‹‚ɏo—Í‚·‚é 99. I—¹ “¯Šú‚·‚éƒZƒbƒg‚̔ԍ† >2 @@ -92,28 +94,28 @@ Enter %FullPath(..)%\_work\FilesB\Project - Synced ‘O‰ñƒRƒ~ƒbƒgŽž‚̃x[ƒX: ".\BaseSub\BB" ‘O‰ñƒRƒ~ƒbƒgŽž‚̃[ƒN: ".\WorkSub\B" -*:“¯Šú‚³‚ê‚Ä‚¢‚È‚¢ƒtƒ@ƒCƒ‹A=:–¢“¯Šú‚Ńy[ƒX‚ƃ[ƒN‚Ì“à—e‚ª“¯‚¶ ------------------------------------------------------------------------------- ¡ƒx[ƒXibase_2j: "..\Project\Base\BB" ¡ƒ[ƒNiwork_2j: "..\Project\Work\B" -1. +=+ NewSame.txt +1. +=+ NewSame.txt -91. ÄƒXƒLƒƒƒ“‚·‚é +91. ÄƒXƒLƒƒƒ“‚·‚é [Rescan] 92. ƒ‹[ƒgEƒtƒHƒ‹ƒ_[‚ðŠJ‚­ -98. ƒx[ƒX‚ƃ[ƒN‚ª“¯‚¶ƒtƒ@ƒCƒ‹‚ð‚·‚×‚ÄƒRƒ~ƒbƒg‚·‚é +93. ó‹µ‚𕪐͂·‚é [Analyze] +98. š ƒx[ƒX‚ƃ[ƒN‚ª“¯‚¶ƒtƒ@ƒCƒ‹‚ð‚·‚×‚ÄƒRƒ~ƒbƒg‚·‚é [AutoCommit] 99. –ß‚é ”Ô† >1 ------------------------------------------------------------------------------- ƒx[ƒXF"%FullPath(..)%\_work\FilesB\Project\Base\BB\NewSame.txt" ƒ[ƒNF"%FullPath(..)%\_work\FilesB\Project\Work\B\NewSame.txt" -Žè“®‚Å“¯Šú‚µ‚½‚çAƒRƒ~ƒbƒg‚µ‚Ä‚­‚¾‚³‚¢B +ŽŸ‚̃ƒjƒ…[‚Ì 1.‚ÅŠJ‚­‚Q‚‚̃tƒ@ƒCƒ‹‚ðŽè“®‚Å“¯Šú‚µ‚½‚çAƒRƒ~ƒbƒg‚µ‚Ä‚­‚¾‚³‚¢B ------------------------------------------------------------------------------- šƒx[ƒXibase_2j: NewSame.txt (+V‹K) šƒ[ƒNiwork_2j: NewSame.txt (+V‹K) 1. Diff ‚ÅŠJ‚­F“¯Šú‚·‚éƒtƒ@ƒCƒ‹ (=“¯‚¶) [ ƒx[ƒX / ƒ[ƒN ] -2. Diff ‚ÅŠJ‚­F‘O‰ñ‚Ì“¯Šú ( ‚È‚µ) [ ƒx[ƒX / ƒ[ƒN ] +2. Diff ‚ÅŠJ‚­F‘O‰ñƒRƒ~ƒbƒgŽž‚Ì“¯Šú“à—e ( ‚È‚µ) [ ƒx[ƒX / ƒ[ƒN ] 4. Diff ‚ÅŠJ‚­Fƒx[ƒX (+V‹K) [ ‘O‰ñƒRƒ~ƒbƒgŽž / Œ»Ý ] 5. Diff ‚ÅŠJ‚­Fƒ[ƒN (+V‹K) [ ‘O‰ñƒRƒ~ƒbƒgŽž / Œ»Ý ] 44.Diff ‚ÅŠJ‚­F[ ‘O‰ñƒRƒ~ƒbƒgŽž‚̃x[ƒX / ƒx[ƒX / ƒ[ƒN ] @@ -122,6 +124,7 @@ Enter Enter‚Ì‚Ý: ÄƒXƒLƒƒƒ“‚·‚é 8. “¯Šú‚ðƒRƒ~ƒbƒg‚·‚é 9. –ß‚é +š‰ü–¼EŒ‹‡E•ª—£E•”•ªˆÚ“®‚ª‚ ‚Á‚½‚Æ‚«‚Ì SyncFilesX ‚Ìà–¾‚ðŽQlB ”ԍ† >8 ------------------------------------------------------------------------------- >copy_ren "%FullPath(..)%\_work\FilesB\Project\Work\B\NewSame.txt", "%FullPath(..)%\_work\FilesB\Project - Synced\WorkSub\B\NewSame.txt" @@ -130,14 +133,14 @@ Enter ------------------------------------------------------------------------------- ƒx[ƒXF"%FullPath(..)%\_work\FilesB\Project\Base\BB\NewSame.txt" ƒ[ƒNF"%FullPath(..)%\_work\FilesB\Project\Work\B\NewSame.txt" -ƒx[ƒXEƒtƒ@ƒCƒ‹‚ƃ[ƒNEƒtƒ@ƒCƒ‹‚́u“¯‚¶“à—ev‚Å‚µ‚½ +ƒx[ƒX ƒtƒ@ƒCƒ‹‚ƃ[ƒN ƒtƒ@ƒCƒ‹‚́u“¯‚¶“à—ev‚Å‚µ‚½B ƒRƒ~ƒbƒg‚µ‚Ü‚µ‚½B ------------------------------------------------------------------------------- šƒx[ƒXibase_2j: NewSame.txt (.•s•Ï) šƒ[ƒNiwork_2j: NewSame.txt (.•s•Ï) 1. Diff ‚ÅŠJ‚­F“¯Šú‚·‚éƒtƒ@ƒCƒ‹ (=“¯‚¶) [ ƒx[ƒX / ƒ[ƒN ] -2. Diff ‚ÅŠJ‚­F‘O‰ñ‚Ì“¯Šú (=“¯‚¶) [ ƒx[ƒX / ƒ[ƒN ] +2. Diff ‚ÅŠJ‚­F‘O‰ñƒRƒ~ƒbƒgŽž‚Ì“¯Šú“à—e (=“¯‚¶) [ ƒx[ƒX / ƒ[ƒN ] 4. Diff ‚ÅŠJ‚­Fƒx[ƒX (.•s•Ï) [ ‘O‰ñƒRƒ~ƒbƒgŽž / Œ»Ý ] 5. Diff ‚ÅŠJ‚­Fƒ[ƒN (.•s•Ï) [ ‘O‰ñƒRƒ~ƒbƒgŽž / Œ»Ý ] 44.Diff ‚ÅŠJ‚­F[ ‘O‰ñƒRƒ~ƒbƒgŽž‚̃x[ƒX / ƒx[ƒX / ƒ[ƒN ] @@ -151,26 +154,26 @@ Enter %FullPath(..)%\_work\FilesB\Project - Synced ‘O‰ñƒRƒ~ƒbƒgŽž‚̃x[ƒX: ".\BaseSub\BB" ‘O‰ñƒRƒ~ƒbƒgŽž‚̃[ƒN: ".\WorkSub\B" -*:“¯Šú‚³‚ê‚Ä‚¢‚È‚¢ƒtƒ@ƒCƒ‹A=:–¢“¯Šú‚Ńy[ƒX‚ƃ[ƒN‚Ì“à—e‚ª“¯‚¶ ------------------------------------------------------------------------------- ¡ƒx[ƒXibase_2j: "..\Project\Base\BB" ¡ƒ[ƒNiwork_2j: "..\Project\Work\B" -i‚È‚µj +‚È‚µi“¯ŠúŠ®—¹j -91. ÄƒXƒLƒƒƒ“‚·‚é +91. ÄƒXƒLƒƒƒ“‚·‚é [Rescan] 92. ƒ‹[ƒgEƒtƒHƒ‹ƒ_[‚ðŠJ‚­ +93. ó‹µ‚𕪐͂·‚é [Analyze] 97. ‚·‚ׂẴtƒ@ƒCƒ‹‚ð•\Ž¦‚·‚é 99. –ß‚é ”Ô† >99 ------------------------------------------------------------------------------- -1. * +1. [101] * ¡ƒx[ƒXibase_1j: "..\Project\Base\AA" ¡ƒ[ƒNiwork_1j: "..\Project\Work\A" -2. +2. [202] ¡ƒx[ƒXibase_2j: "..\Project\Base\BB" ¡ƒ[ƒNiwork_2j: "..\Project\Work\B" -91. ÄƒXƒLƒƒƒ“‚·‚é +91. ÄƒXƒLƒƒƒ“‚·‚é [Rescan] 93. ‚·‚ׂẴ[ƒNƒtƒ@ƒCƒ‹‚̈ꗗ‚ðƒtƒ@ƒCƒ‹‚ɏo—Í‚·‚é 99. I—¹ “¯Šú‚·‚éƒZƒbƒg‚̔ԍ† >99