%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. - DeleteBaseFromOnly.txt\r
-2. - - DeleteBoth.txt\r
-3. - DeleteWorkFromOnly.txt\r
-4. +!+ NewNotSame.txt\r
-5. +=+ NewSame.txt\r
-6. - SubForWork\DeleteBaseFromOnly.txt\r
-7. - - SubForWork\DeleteBoth.txt\r
-8. - SubForWork\DeleteWorkFromOnly.txt\r
-9. *!. SubForWork\UpdateBase.txt\r
-10. *=* SubForWork\UpdateBothSame_ForWork.txt\r
-11. .!* SubForWork\UpdateWork.txt\r
-12. *!. UpdateBase.txt\r
-13. *!* UpdateBoth.txt\r
-14. .!* UpdateWork.txt\r
+1. - =DeleteBaseFromOnly.txt\r
+2. - - =DeleteBoth.txt\r
+3. - =DeleteWorkFromOnly.txt\r
+4. +!+ =NewNotSame.txt\r
+5. +=+ =NewSame.txt\r
+6. - =SubForWork\DeleteBaseFromOnly.txt\r
+7. - - =SubForWork\DeleteBoth.txt\r
+8. - =SubForWork\DeleteWorkFromOnly.txt\r
+9. *!. =SubForWork\UpdateBase.txt\r
+10. *=* =SubForWork\UpdateBothSame_ForWork.txt\r
+11. .!* =SubForWork\UpdateWork.txt\r
+12. *!. =UpdateBase.txt\r
+13. *!* =UpdateBoth.txt\r
+14. .!* =UpdateWork.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 12/18 (67%%)\r
\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+95. \81\9a\81u\93¯\82¶\93à\97e\81v\82É\82È\82é\82×\82«\83t\83@\83C\83\8b\82ð\93¯\82¶\93à\97e\82É\82·\82é [AutoSynchronize]\r
99. \8fI\97¹\r
\94Ô\8d\86 >10\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82·\r
-\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82·\81B\r
+\8e\9f\82Ì\83\81\83j\83\85\81[\82Ì 1.\82Å\8aJ\82\82Q\82Â\82Ì\83t\83@\83C\83\8b\82ð\8eè\93®\82Å\93¯\8aú\82µ\82½\82ç\81A\83R\83~\83b\83g\82µ\82Ä\82\82¾\82³\82¢\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\UpdateBothSame_ForBase.txt (*\95Ï\8dX)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\UpdateBothSame_ForWork.txt (*\95Ï\8dX)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (*\95Ï\8dX) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
-------------------------------------------------------------------------------\r
\83x\81[\83X\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForBase.txt"\r
\83\8f\81[\83N\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForWork.txt"\r
-\83x\81[\83X\81E\83t\83@\83C\83\8b\82Æ\83\8f\81[\83N\81E\83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82·\r
+\83x\81[\83X \83t\83@\83C\83\8b\82Æ\83\8f\81[\83N \83t\83@\83C\83\8b\82Í\81u\93¯\82¶\93à\97e\81v\82Å\82·\81B\r
\83R\83~\83b\83g\82µ\82Ü\82µ\82½\81B\r
-------------------------------------------------------------------------------\r
\81\9a\83x\81[\83X\81iBASE\81j: SubForBase\UpdateBothSame_ForBase.txt (.\95s\95Ï)\r
\81\9a\83\8f\81[\83N\81iWORK\81j: SubForWork\UpdateBothSame_ForWork.txt (.\95s\95Ï)\r
\r
1. Diff \82Å\8aJ\82\81F\93¯\8aú\82·\82é\83t\83@\83C\83\8b (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
-2. Diff \82Å\8aJ\82\81F\91O\89ñ\82Ì\93¯\8aú (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
+2. Diff \82Å\8aJ\82\81F\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\93¯\8aú\93à\97e (=\93¯\82¶) [ \83x\81[\83X / \83\8f\81[\83N ]\r
4. Diff \82Å\8aJ\82\81F\83x\81[\83X (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
5. Diff \82Å\8aJ\82\81F\83\8f\81[\83N (.\95s\95Ï) [ \91O\89ñ\83R\83~\83b\83g\8e\9e / \8c»\8dÝ ]\r
44.Diff \82Å\8aJ\82\81F[ \91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X / \83x\81[\83X / \83\8f\81[\83N ]\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. - DeleteBaseFromOnly.txt\r
-2. - - DeleteBoth.txt\r
-3. - DeleteWorkFromOnly.txt\r
-4. +!+ NewNotSame.txt\r
-5. +=+ NewSame.txt\r
-6. - SubForWork\DeleteBaseFromOnly.txt\r
-7. - - SubForWork\DeleteBoth.txt\r
-8. - SubForWork\DeleteWorkFromOnly.txt\r
-9. *!. SubForWork\UpdateBase.txt\r
-10. .!* SubForWork\UpdateWork.txt\r
-11. *!. UpdateBase.txt\r
-12. *!* UpdateBoth.txt\r
-13. .!* UpdateWork.txt\r
+1. - =DeleteBaseFromOnly.txt\r
+2. - - =DeleteBoth.txt\r
+3. - =DeleteWorkFromOnly.txt\r
+4. +!+ =NewNotSame.txt\r
+5. +=+ =NewSame.txt\r
+6. - =SubForWork\DeleteBaseFromOnly.txt\r
+7. - - =SubForWork\DeleteBoth.txt\r
+8. - =SubForWork\DeleteWorkFromOnly.txt\r
+9. *!. =SubForWork\UpdateBase.txt\r
+10. .!* =SubForWork\UpdateWork.txt\r
+11. *!. =UpdateBase.txt\r
+12. *!* =UpdateBoth.txt\r
+13. .!* =UpdateWork.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 12/18 (67%%)\r
\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
-98. \83x\81[\83X\82Æ\83\8f\81[\83N\82ª\93¯\82¶\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82·\82é\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+95. \81\9a\81u\93¯\82¶\93à\97e\81v\82É\82È\82é\82×\82«\83t\83@\83C\83\8b\82ð\93¯\82¶\93à\97e\82É\82·\82é [AutoSynchronize]\r
99. \8fI\97¹\r
\94Ô\8d\86 >98\r
\r
%FullPath(..)%\FilesA\Project - Synced\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
-*:\93¯\8aú\82³\82ê\82Ä\82¢\82È\82¢\83t\83@\83C\83\8b\81A=:\96¢\93¯\8aú\82Å\83y\81[\83X\82Æ\83\8f\81[\83N\82Ì\93à\97e\82ª\93¯\82¶\r
-------------------------------------------------------------------------------\r
\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
-1. +!+ NewNotSame.txt\r
-2. *!. SubForWork\UpdateBase.txt\r
-3. .!* SubForWork\UpdateWork.txt\r
-4. *!. UpdateBase.txt\r
-5. *!* UpdateBoth.txt\r
-6. .!* UpdateWork.txt\r
+1. +!+ =NewNotSame.txt\r
+2. *!. =SubForWork\UpdateBase.txt\r
+3. .!* =SubForWork\UpdateWork.txt\r
+4. *!. =UpdateBase.txt\r
+5. *!* =UpdateBoth.txt\r
+6. .!* =UpdateWork.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 12/18 (67%%)\r
+\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
+92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
+95. \81\9a\81u\93¯\82¶\93à\97e\81v\82É\82È\82é\82×\82«\83t\83@\83C\83\8b\82ð\93¯\82¶\93à\97e\82É\82·\82é [AutoSynchronize]\r
+99. \8fI\97¹\r
+\94Ô\8d\86 >95\r
+\r
+*!. =SubForWork\UpdateBase.txt\r
+.!* =SubForWork\UpdateWork.txt\r
+*!. =UpdateBase.txt\r
+.!* =UpdateWork.txt\r
+\88È\8fã\82Ì\83t\83@\83C\83\8b\82ð\82·\82×\82Ä\83R\83~\83b\83g\82µ\82Ü\82·\82©(y/n)y\r
+-------------------------------------------------------------------------------\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBase.txt", "%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBase.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\UpdateBase.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\UpdateBase.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateWork.txt", "%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateWork.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\UpdateWork.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\UpdateWork.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateBase.txt", "%FullPath(..)%\FilesA\Project\Work\UpdateBase.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateBase.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateBase.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateWork.txt", "%FullPath(..)%\FilesA\Project\Base\UpdateWork.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateWork.txt"\r
+>copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateWork.txt"\r
+-------------------------------------------------------------------------------\r
+%FullPath(..)%\FilesA\Project - Synced\r
+\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83x\81[\83X: "Base"\r
+\91O\89ñ\83R\83~\83b\83g\8e\9e\82Ì\83\8f\81[\83N: "Work"\r
+-------------------------------------------------------------------------------\r
+\81¡\83x\81[\83X\81iBASE\81j: "..\Project\Base"\r
+\81¡\83\8f\81[\83N\81iWORK\81j: "..\Project\Work"\r
+1. +!+ =NewNotSame.txt\r
+2. *!* =UpdateBoth.txt\r
+\8d¶\89E\97¼\95û\82 \82é\83t\83@\83C\83\8b\82Ì\90\94\81\81 12/18 (67%%)\r
\r
-91. \8dÄ\83X\83L\83\83\83\93\82·\82é\r
+91. \8dÄ\83X\83L\83\83\83\93\82·\82é [Rescan]\r
92. \83\8b\81[\83g\81E\83t\83H\83\8b\83_\81[\82ð\8aJ\82\r
+93. \8fó\8bµ\82ð\95ª\90Í\82·\82é [Analyze]\r
99. \8fI\97¹\r
\94Ô\8d\86 >99\r
Pass.\r