1 >SetVar "Setting_getDiffCmdLine", "ArgsLog"
\r
2 %FullPath(..)%\FilesA\Project - Synced\SyncFilesX_Auto.xml
\r
4 \93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b\82Ì
\88ê
\97\97\81F
\r
5 \92\86\89\9b\82Ì
\8bL
\8d\86\82Ì
\88Ó
\96¡: [=]
\93¯
\82¶ [!]
\88Ù
\82È
\82é [ ]
\97¼
\95û
\95s
\8dÝ
\r
6 \8d¶
\89E
\82Ì
\8bL
\8d\86\82Ì
\88Ó
\96¡: [*]
\95Ï
\8dX [+]
\92Ç
\89Á [-]
\8dí
\8f\9c [.]
\95s
\95Ï [ ]
\95s
\8dÝ
\r
7 \8d¶
\82Í
\83x
\81[
\83X
\81A
\89E
\82Í
\83\8f\81[
\83N
\r
9 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
10 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
11 1. +!. CopyAndModifyToBase.txt
\r
12 2. .!+ CopyAndModifyToWork.txt
\r
13 3. +=. CopyToBase.txt
\r
14 4. .=+ CopyToWork.txt
\r
15 5. -!. DeleteBaseFromBoth.txt
\r
16 6. - DeleteBaseFromOnly.txt
\r
17 7. - - DeleteBoth.txt
\r
18 8. .!- DeleteWorkFromBoth.txt
\r
19 9. - DeleteWorkFromOnly.txt
\r
21 11. +!+ NewNotSame.txt
\r
24 14. .=. NoUpdate_Same.txt
\r
25 15. .!. NoUpdateAlmostSame.txt
\r
26 16. .! NoUpdateBaseOnly.txt
\r
27 17. !. NoUpdateWorkOnly.txt
\r
28 18. - SubForWork\DeleteBaseFromOnly.txt
\r
29 19. - - SubForWork\DeleteBoth.txt
\r
30 20. .=. SubForWork\NoUpdate_Same.txt
\r
31 21. .!. SubForWork\NoUpdateAlmostSame.txt
\r
32 22. *!. SubForWork\UpdateBase.txt
\r
33 23. *! SubForWork\UpdateBothSame_ForBase.txt
\r
34 24. .!* SubForWork\UpdateWork.txt
\r
35 25. - SubForWork\DeleteWorkFromOnly.txt
\r
36 26. !* SubForWork\UpdateBothSame_ForWork.txt
\r
37 27. *!. UpdateBase.txt
\r
38 28. *!. UpdateBaseAlmostSame.txt
\r
39 29. *=. UpdateBaseAlmostSameToSame.txt
\r
40 30. *!* UpdateBoth.txt
\r
41 31. *!* UpdateBothAlmostSame.txt
\r
42 32. *=* UpdateSame.txt
\r
43 33. .!* UpdateWork.txt
\r
44 34. .!* UpdateWorkAlmostSame.txt
\r
45 35. .=* UpdateWorkAlmostSameToSame.txt
\r
47 -------------------------------------------------------------------------------
\r
48 %FullPath(..)%\FilesA\Project - Synced
\r
49 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
50 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
51 -------------------------------------------------------------------------------
\r
52 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
53 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
54 1. +!. CopyAndModifyToBase.txt
\r
55 2. .!+ CopyAndModifyToWork.txt
\r
56 3. +=. CopyToBase.txt
\r
57 4. .=+ CopyToWork.txt
\r
58 5. -!. DeleteBaseFromBoth.txt
\r
59 6. - DeleteBaseFromOnly.txt
\r
60 7. - - DeleteBoth.txt
\r
61 8. .!- DeleteWorkFromBoth.txt
\r
62 9. - DeleteWorkFromOnly.txt
\r
64 11. +!+ NewNotSame.txt
\r
67 14. - SubForWork\DeleteBaseFromOnly.txt
\r
68 15. - - SubForWork\DeleteBoth.txt
\r
69 16. - SubForWork\DeleteWorkFromOnly.txt
\r
70 17. *!. SubForWork\UpdateBase.txt
\r
71 18. *! SubForWork\UpdateBothSame_ForBase.txt
\r
72 19. !* SubForWork\UpdateBothSame_ForWork.txt
\r
73 20. .!* SubForWork\UpdateWork.txt
\r
74 21. *!. UpdateBase.txt
\r
75 22. *!. UpdateBaseAlmostSame.txt
\r
76 23. *=. UpdateBaseAlmostSameToSame.txt
\r
77 24. *!* UpdateBoth.txt
\r
78 25. *!* UpdateBothAlmostSame.txt
\r
79 26. *=* UpdateSame.txt
\r
80 27. .!* UpdateWork.txt
\r
81 28. .!* UpdateWorkAlmostSame.txt
\r
82 29. .=* UpdateWorkAlmostSameToSame.txt
\r
83 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
85 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
86 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
87 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
88 98.
\81\9a \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é [AutoCommit]
\r
91 -------------------------------------------------------------------------------
\r
92 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\CopyAndModifyToBase.txt"
\r
93 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\CopyAndModifyToBase.txt"
\r
94 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
95 \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
96 -------------------------------------------------------------------------------
\r
97 \81\9a\83x
\81[
\83X
\81iBASE
\81j: CopyAndModifyToBase.txt (+
\90V
\8bK)
\r
98 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: CopyAndModifyToBase.txt (.
\95s
\95Ï)
\r
100 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
101 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
102 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (+
\90V
\8bK) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
103 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
104 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
105 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
106 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
107 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
108 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
110 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
112 -------------------------------------------------------------------------------
\r
113 >copy_ren "%FullPath(..)%\FilesA\Project\Work\CopyAndModifyToBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\CopyAndModifyToBase.txt"
\r
114 >copy_ren "%FullPath(..)%\FilesA\Project\Base\CopyAndModifyToBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\CopyAndModifyToBase.txt"
\r
115 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
116 -------------------------------------------------------------------------------
\r
117 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\CopyAndModifyToBase.txt"
\r
118 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\CopyAndModifyToBase.txt"
\r
119 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
120 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
121 -------------------------------------------------------------------------------
\r
122 \81\9a\83x
\81[
\83X
\81iBASE
\81j: CopyAndModifyToBase.txt (.
\95s
\95Ï)
\r
123 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: CopyAndModifyToBase.txt (.
\95s
\95Ï)
\r
125 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
126 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
127 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
128 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
129 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
130 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
131 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
132 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
133 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
136 -------------------------------------------------------------------------------
\r
137 %FullPath(..)%\FilesA\Project - Synced
\r
138 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
139 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
140 -------------------------------------------------------------------------------
\r
141 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
142 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
143 1. .!+ CopyAndModifyToWork.txt
\r
144 2. +=. CopyToBase.txt
\r
145 3. .=+ CopyToWork.txt
\r
146 4. -!. DeleteBaseFromBoth.txt
\r
147 5. - DeleteBaseFromOnly.txt
\r
148 6. - - DeleteBoth.txt
\r
149 7. .!- DeleteWorkFromBoth.txt
\r
150 8. - DeleteWorkFromOnly.txt
\r
152 10. +!+ NewNotSame.txt
\r
153 11. +=+ NewSame.txt
\r
155 13. - SubForWork\DeleteBaseFromOnly.txt
\r
156 14. - - SubForWork\DeleteBoth.txt
\r
157 15. - SubForWork\DeleteWorkFromOnly.txt
\r
158 16. *!. SubForWork\UpdateBase.txt
\r
159 17. *! SubForWork\UpdateBothSame_ForBase.txt
\r
160 18. !* SubForWork\UpdateBothSame_ForWork.txt
\r
161 19. .!* SubForWork\UpdateWork.txt
\r
162 20. *!. UpdateBase.txt
\r
163 21. *!. UpdateBaseAlmostSame.txt
\r
164 22. *=. UpdateBaseAlmostSameToSame.txt
\r
165 23. *!* UpdateBoth.txt
\r
166 24. *!* UpdateBothAlmostSame.txt
\r
167 25. *=* UpdateSame.txt
\r
168 26. .!* UpdateWork.txt
\r
169 27. .!* UpdateWorkAlmostSame.txt
\r
170 28. .=* UpdateWorkAlmostSameToSame.txt
\r
171 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
173 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
174 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
175 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
176 98.
\81\9a \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é [AutoCommit]
\r
179 -------------------------------------------------------------------------------
\r
180 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\CopyAndModifyToWork.txt"
\r
181 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\CopyAndModifyToWork.txt"
\r
182 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
183 \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
184 -------------------------------------------------------------------------------
\r
185 \81\9a\83x
\81[
\83X
\81iBASE
\81j: CopyAndModifyToWork.txt (.
\95s
\95Ï)
\r
186 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: CopyAndModifyToWork.txt (+
\90V
\8bK)
\r
188 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
189 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
190 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
191 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (+
\90V
\8bK) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
192 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
193 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
194 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
195 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
196 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
198 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
200 -------------------------------------------------------------------------------
\r
201 >copy_ren "%FullPath(..)%\FilesA\Project\Work\CopyAndModifyToWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\CopyAndModifyToWork.txt"
\r
202 >copy_ren "%FullPath(..)%\FilesA\Project\Base\CopyAndModifyToWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\CopyAndModifyToWork.txt"
\r
203 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
204 -------------------------------------------------------------------------------
\r
205 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\CopyAndModifyToWork.txt"
\r
206 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\CopyAndModifyToWork.txt"
\r
207 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
208 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
209 -------------------------------------------------------------------------------
\r
210 \81\9a\83x
\81[
\83X
\81iBASE
\81j: CopyAndModifyToWork.txt (.
\95s
\95Ï)
\r
211 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: CopyAndModifyToWork.txt (.
\95s
\95Ï)
\r
213 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
214 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
215 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
216 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
217 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
218 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
219 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
220 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
221 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
224 -------------------------------------------------------------------------------
\r
225 %FullPath(..)%\FilesA\Project - Synced
\r
226 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
227 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
228 -------------------------------------------------------------------------------
\r
229 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
230 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
231 1. +=. CopyToBase.txt
\r
232 2. .=+ CopyToWork.txt
\r
233 3. -!. DeleteBaseFromBoth.txt
\r
234 4. - DeleteBaseFromOnly.txt
\r
235 5. - - DeleteBoth.txt
\r
236 6. .!- DeleteWorkFromBoth.txt
\r
237 7. - DeleteWorkFromOnly.txt
\r
239 9. +!+ NewNotSame.txt
\r
240 10. +=+ NewSame.txt
\r
242 12. - SubForWork\DeleteBaseFromOnly.txt
\r
243 13. - - SubForWork\DeleteBoth.txt
\r
244 14. - SubForWork\DeleteWorkFromOnly.txt
\r
245 15. *!. SubForWork\UpdateBase.txt
\r
246 16. *! SubForWork\UpdateBothSame_ForBase.txt
\r
247 17. !* SubForWork\UpdateBothSame_ForWork.txt
\r
248 18. .!* SubForWork\UpdateWork.txt
\r
249 19. *!. UpdateBase.txt
\r
250 20. *!. UpdateBaseAlmostSame.txt
\r
251 21. *=. UpdateBaseAlmostSameToSame.txt
\r
252 22. *!* UpdateBoth.txt
\r
253 23. *!* UpdateBothAlmostSame.txt
\r
254 24. *=* UpdateSame.txt
\r
255 25. .!* UpdateWork.txt
\r
256 26. .!* UpdateWorkAlmostSame.txt
\r
257 27. .=* UpdateWorkAlmostSameToSame.txt
\r
258 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
260 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
261 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
262 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
263 98.
\81\9a \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é [AutoCommit]
\r
266 -------------------------------------------------------------------------------
\r
267 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\CopyToBase.txt"
\r
268 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\CopyToBase.txt"
\r
269 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
270 \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
271 -------------------------------------------------------------------------------
\r
272 \81\9a\83x
\81[
\83X
\81iBASE
\81j: CopyToBase.txt (+
\90V
\8bK)
\r
273 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: CopyToBase.txt (.
\95s
\95Ï)
\r
275 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
276 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
277 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (+
\90V
\8bK) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
278 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
279 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
280 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
281 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
282 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
283 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
285 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
288 \81\9a[WARNING]
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Å
\93à
\97e
\82ª
\88Ù
\82È
\82Á
\82Ä
\82¢
\82½
\82Ì
\82ª
\93¯
\82¶
\82É
\82È
\82è
\82Ü
\82µ
\82½
\81B
\r
290 \8cx
\8d\90\82ª
\82 \82è
\82Ü
\82µ
\82½
\82ª
\81A
\82æ
\82ë
\82µ
\82¢
\82Å
\82·
\82©(y/n)y
\r
291 -------------------------------------------------------------------------------
\r
292 >copy_ren "%FullPath(..)%\FilesA\Project\Work\CopyToBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\CopyToBase.txt"
\r
293 >copy_ren "%FullPath(..)%\FilesA\Project\Base\CopyToBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\CopyToBase.txt"
\r
294 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
295 -------------------------------------------------------------------------------
\r
296 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\CopyToBase.txt"
\r
297 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\CopyToBase.txt"
\r
298 \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µ
\82½
\81B
\r
299 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
300 -------------------------------------------------------------------------------
\r
301 \81\9a\83x
\81[
\83X
\81iBASE
\81j: CopyToBase.txt (.
\95s
\95Ï)
\r
302 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: CopyToBase.txt (.
\95s
\95Ï)
\r
304 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
305 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
306 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
307 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
308 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
309 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
310 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
311 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
312 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
315 -------------------------------------------------------------------------------
\r
316 %FullPath(..)%\FilesA\Project - Synced
\r
317 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
318 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
319 -------------------------------------------------------------------------------
\r
320 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
321 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
322 1. .=+ CopyToWork.txt
\r
323 2. -!. DeleteBaseFromBoth.txt
\r
324 3. - DeleteBaseFromOnly.txt
\r
325 4. - - DeleteBoth.txt
\r
326 5. .!- DeleteWorkFromBoth.txt
\r
327 6. - DeleteWorkFromOnly.txt
\r
329 8. +!+ NewNotSame.txt
\r
332 11. - SubForWork\DeleteBaseFromOnly.txt
\r
333 12. - - SubForWork\DeleteBoth.txt
\r
334 13. - SubForWork\DeleteWorkFromOnly.txt
\r
335 14. *!. SubForWork\UpdateBase.txt
\r
336 15. *! SubForWork\UpdateBothSame_ForBase.txt
\r
337 16. !* SubForWork\UpdateBothSame_ForWork.txt
\r
338 17. .!* SubForWork\UpdateWork.txt
\r
339 18. *!. UpdateBase.txt
\r
340 19. *!. UpdateBaseAlmostSame.txt
\r
341 20. *=. UpdateBaseAlmostSameToSame.txt
\r
342 21. *!* UpdateBoth.txt
\r
343 22. *!* UpdateBothAlmostSame.txt
\r
344 23. *=* UpdateSame.txt
\r
345 24. .!* UpdateWork.txt
\r
346 25. .!* UpdateWorkAlmostSame.txt
\r
347 26. .=* UpdateWorkAlmostSameToSame.txt
\r
348 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
350 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
351 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
352 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
353 98.
\81\9a \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é [AutoCommit]
\r
356 -------------------------------------------------------------------------------
\r
357 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\CopyToWork.txt"
\r
358 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\CopyToWork.txt"
\r
359 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
360 \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
361 -------------------------------------------------------------------------------
\r
362 \81\9a\83x
\81[
\83X
\81iBASE
\81j: CopyToWork.txt (.
\95s
\95Ï)
\r
363 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: CopyToWork.txt (+
\90V
\8bK)
\r
365 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
366 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
367 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
368 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (+
\90V
\8bK) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
369 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
370 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
371 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
372 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
373 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
375 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
378 \81\9a[WARNING]
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Å
\93à
\97e
\82ª
\88Ù
\82È
\82Á
\82Ä
\82¢
\82½
\82Ì
\82ª
\93¯
\82¶
\82É
\82È
\82è
\82Ü
\82µ
\82½
\81B
\r
380 \8cx
\8d\90\82ª
\82 \82è
\82Ü
\82µ
\82½
\82ª
\81A
\82æ
\82ë
\82µ
\82¢
\82Å
\82·
\82©(y/n)y
\r
381 -------------------------------------------------------------------------------
\r
382 >copy_ren "%FullPath(..)%\FilesA\Project\Work\CopyToWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\CopyToWork.txt"
\r
383 >copy_ren "%FullPath(..)%\FilesA\Project\Base\CopyToWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\CopyToWork.txt"
\r
384 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
385 -------------------------------------------------------------------------------
\r
386 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\CopyToWork.txt"
\r
387 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\CopyToWork.txt"
\r
388 \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µ
\82½
\81B
\r
389 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
390 -------------------------------------------------------------------------------
\r
391 \81\9a\83x
\81[
\83X
\81iBASE
\81j: CopyToWork.txt (.
\95s
\95Ï)
\r
392 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: CopyToWork.txt (.
\95s
\95Ï)
\r
394 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
395 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
396 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
397 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
398 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
399 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
400 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
401 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
402 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
405 -------------------------------------------------------------------------------
\r
406 %FullPath(..)%\FilesA\Project - Synced
\r
407 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
408 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
409 -------------------------------------------------------------------------------
\r
410 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
411 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
412 1. -!. DeleteBaseFromBoth.txt
\r
413 2. - DeleteBaseFromOnly.txt
\r
414 3. - - DeleteBoth.txt
\r
415 4. .!- DeleteWorkFromBoth.txt
\r
416 5. - DeleteWorkFromOnly.txt
\r
418 7. +!+ NewNotSame.txt
\r
421 10. - SubForWork\DeleteBaseFromOnly.txt
\r
422 11. - - SubForWork\DeleteBoth.txt
\r
423 12. - SubForWork\DeleteWorkFromOnly.txt
\r
424 13. *!. SubForWork\UpdateBase.txt
\r
425 14. *! SubForWork\UpdateBothSame_ForBase.txt
\r
426 15. !* SubForWork\UpdateBothSame_ForWork.txt
\r
427 16. .!* SubForWork\UpdateWork.txt
\r
428 17. *!. UpdateBase.txt
\r
429 18. *!. UpdateBaseAlmostSame.txt
\r
430 19. *=. UpdateBaseAlmostSameToSame.txt
\r
431 20. *!* UpdateBoth.txt
\r
432 21. *!* UpdateBothAlmostSame.txt
\r
433 22. *=* UpdateSame.txt
\r
434 23. .!* UpdateWork.txt
\r
435 24. .!* UpdateWorkAlmostSame.txt
\r
436 25. .=* UpdateWorkAlmostSameToSame.txt
\r
437 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
439 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
440 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
441 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
442 98.
\81\9a \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é [AutoCommit]
\r
445 -------------------------------------------------------------------------------
\r
446 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\DeleteBaseFromBoth.txt"
\r
447 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\DeleteBaseFromBoth.txt"
\r
448 \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µ
\82½
\81B
\r
449 \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
450 -------------------------------------------------------------------------------
\r
451 \81\9a\83x
\81[
\83X
\81iBASE
\81j: DeleteBaseFromBoth.txt (-
\8dí
\8f\9c)
\r
452 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: DeleteBaseFromBoth.txt (.
\95s
\95Ï)
\r
454 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
455 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
456 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (-
\8dí
\8f\9c) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
457 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
458 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
459 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
460 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
461 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
462 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
464 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
467 \81\9a[WARNING]
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Å
\93à
\97e
\82ª
\93¯
\82¶
\82¾
\82Á
\82½
\82Ì
\82ª
\88Ù
\82È
\82é
\82æ
\82¤
\82É
\82È
\82è
\82Ü
\82µ
\82½
\81B
\r
469 \8cx
\8d\90\82ª
\82 \82è
\82Ü
\82µ
\82½
\82ª
\81A
\82æ
\82ë
\82µ
\82¢
\82Å
\82·
\82©(y/n)y
\r
470 -------------------------------------------------------------------------------
\r
471 >copy_ren "%FullPath(..)%\FilesA\Project\Work\DeleteBaseFromBoth.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\DeleteBaseFromBoth.txt"
\r
472 >del "%FullPath(..)%\FilesA\Project - Synced\Base\DeleteBaseFromBoth.txt"
\r
473 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
474 -------------------------------------------------------------------------------
\r
475 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\DeleteBaseFromBoth.txt"
\r
476 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\DeleteBaseFromBoth.txt"
\r
477 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
478 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
479 -------------------------------------------------------------------------------
\r
480 \81\9a\83x
\81[
\83X
\81iBASE
\81j: DeleteBaseFromBoth.txt (
\82È
\82µ)
\r
481 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: DeleteBaseFromBoth.txt (.
\95s
\95Ï)
\r
483 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
484 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
485 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
486 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
487 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
488 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
489 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
490 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
491 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
494 -------------------------------------------------------------------------------
\r
495 %FullPath(..)%\FilesA\Project - Synced
\r
496 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
497 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
498 -------------------------------------------------------------------------------
\r
499 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
500 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
501 1. - DeleteBaseFromOnly.txt
\r
502 2. - - DeleteBoth.txt
\r
503 3. .!- DeleteWorkFromBoth.txt
\r
504 4. - DeleteWorkFromOnly.txt
\r
506 6. +!+ NewNotSame.txt
\r
509 9. - SubForWork\DeleteBaseFromOnly.txt
\r
510 10. - - SubForWork\DeleteBoth.txt
\r
511 11. - SubForWork\DeleteWorkFromOnly.txt
\r
512 12. *!. SubForWork\UpdateBase.txt
\r
513 13. *! SubForWork\UpdateBothSame_ForBase.txt
\r
514 14. !* SubForWork\UpdateBothSame_ForWork.txt
\r
515 15. .!* SubForWork\UpdateWork.txt
\r
516 16. *!. UpdateBase.txt
\r
517 17. *!. UpdateBaseAlmostSame.txt
\r
518 18. *=. UpdateBaseAlmostSameToSame.txt
\r
519 19. *!* UpdateBoth.txt
\r
520 20. *!* UpdateBothAlmostSame.txt
\r
521 21. *=* UpdateSame.txt
\r
522 22. .!* UpdateWork.txt
\r
523 23. .!* UpdateWorkAlmostSame.txt
\r
524 24. .=* UpdateWorkAlmostSameToSame.txt
\r
525 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
527 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
528 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
529 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
530 98.
\81\9a \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é [AutoCommit]
\r
533 -------------------------------------------------------------------------------
\r
534 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\DeleteBaseFromOnly.txt"
\r
535 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\DeleteBaseFromOnly.txt"
\r
536 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
537 \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
538 -------------------------------------------------------------------------------
\r
539 \81\9a\83x
\81[
\83X
\81iBASE
\81j: DeleteBaseFromOnly.txt (-
\8dí
\8f\9c)
\r
540 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: DeleteBaseFromOnly.txt (
\82È
\82µ)
\r
542 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
543 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
544 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (-
\8dí
\8f\9c) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
545 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
546 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
547 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
548 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
549 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
550 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
552 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
554 -------------------------------------------------------------------------------
\r
555 >del "%FullPath(..)%\FilesA\Project - Synced\Work\DeleteBaseFromOnly.txt"
\r
556 >del "%FullPath(..)%\FilesA\Project - Synced\Base\DeleteBaseFromOnly.txt"
\r
557 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
558 -------------------------------------------------------------------------------
\r
559 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\DeleteBaseFromOnly.txt"
\r
560 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\DeleteBaseFromOnly.txt"
\r
562 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
563 -------------------------------------------------------------------------------
\r
564 \81\9a\83x
\81[
\83X
\81iBASE
\81j: DeleteBaseFromOnly.txt (
\82È
\82µ)
\r
565 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: DeleteBaseFromOnly.txt (
\82È
\82µ)
\r
567 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
568 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
569 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
570 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
571 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
572 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
573 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
574 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
575 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
578 -------------------------------------------------------------------------------
\r
579 %FullPath(..)%\FilesA\Project - Synced
\r
580 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
581 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
582 -------------------------------------------------------------------------------
\r
583 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
584 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
585 1. - - DeleteBoth.txt
\r
586 2. .!- DeleteWorkFromBoth.txt
\r
587 3. - DeleteWorkFromOnly.txt
\r
589 5. +!+ NewNotSame.txt
\r
592 8. - SubForWork\DeleteBaseFromOnly.txt
\r
593 9. - - SubForWork\DeleteBoth.txt
\r
594 10. - SubForWork\DeleteWorkFromOnly.txt
\r
595 11. *!. SubForWork\UpdateBase.txt
\r
596 12. *! SubForWork\UpdateBothSame_ForBase.txt
\r
597 13. !* SubForWork\UpdateBothSame_ForWork.txt
\r
598 14. .!* SubForWork\UpdateWork.txt
\r
599 15. *!. UpdateBase.txt
\r
600 16. *!. UpdateBaseAlmostSame.txt
\r
601 17. *=. UpdateBaseAlmostSameToSame.txt
\r
602 18. *!* UpdateBoth.txt
\r
603 19. *!* UpdateBothAlmostSame.txt
\r
604 20. *=* UpdateSame.txt
\r
605 21. .!* UpdateWork.txt
\r
606 22. .!* UpdateWorkAlmostSame.txt
\r
607 23. .=* UpdateWorkAlmostSameToSame.txt
\r
608 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
610 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
611 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
612 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
613 98.
\81\9a \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é [AutoCommit]
\r
616 -------------------------------------------------------------------------------
\r
617 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\DeleteBoth.txt"
\r
618 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\DeleteBoth.txt"
\r
619 \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µ
\82½
\81B
\r
620 \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
621 -------------------------------------------------------------------------------
\r
622 \81\9a\83x
\81[
\83X
\81iBASE
\81j: DeleteBoth.txt (-
\8dí
\8f\9c)
\r
623 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: DeleteBoth.txt (-
\8dí
\8f\9c)
\r
625 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
626 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
627 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (-
\8dí
\8f\9c) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
628 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (-
\8dí
\8f\9c) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
629 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
630 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
631 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
632 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
633 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
635 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
637 -------------------------------------------------------------------------------
\r
638 >del "%FullPath(..)%\FilesA\Project - Synced\Work\DeleteBoth.txt"
\r
639 >del "%FullPath(..)%\FilesA\Project - Synced\Base\DeleteBoth.txt"
\r
640 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
641 -------------------------------------------------------------------------------
\r
642 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\DeleteBoth.txt"
\r
643 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\DeleteBoth.txt"
\r
645 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
646 -------------------------------------------------------------------------------
\r
647 \81\9a\83x
\81[
\83X
\81iBASE
\81j: DeleteBoth.txt (
\82È
\82µ)
\r
648 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: DeleteBoth.txt (
\82È
\82µ)
\r
650 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
651 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
652 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
653 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
654 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
655 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
656 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
657 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
658 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
661 -------------------------------------------------------------------------------
\r
662 %FullPath(..)%\FilesA\Project - Synced
\r
663 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
664 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
665 -------------------------------------------------------------------------------
\r
666 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
667 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
668 1. .!- DeleteWorkFromBoth.txt
\r
669 2. - DeleteWorkFromOnly.txt
\r
671 4. +!+ NewNotSame.txt
\r
674 7. - SubForWork\DeleteBaseFromOnly.txt
\r
675 8. - - SubForWork\DeleteBoth.txt
\r
676 9. - SubForWork\DeleteWorkFromOnly.txt
\r
677 10. *!. SubForWork\UpdateBase.txt
\r
678 11. *! SubForWork\UpdateBothSame_ForBase.txt
\r
679 12. !* SubForWork\UpdateBothSame_ForWork.txt
\r
680 13. .!* SubForWork\UpdateWork.txt
\r
681 14. *!. UpdateBase.txt
\r
682 15. *!. UpdateBaseAlmostSame.txt
\r
683 16. *=. UpdateBaseAlmostSameToSame.txt
\r
684 17. *!* UpdateBoth.txt
\r
685 18. *!* UpdateBothAlmostSame.txt
\r
686 19. *=* UpdateSame.txt
\r
687 20. .!* UpdateWork.txt
\r
688 21. .!* UpdateWorkAlmostSame.txt
\r
689 22. .=* UpdateWorkAlmostSameToSame.txt
\r
690 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
692 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
693 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
694 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
695 98.
\81\9a \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é [AutoCommit]
\r
698 -------------------------------------------------------------------------------
\r
699 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\DeleteWorkFromBoth.txt"
\r
700 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\DeleteWorkFromBoth.txt"
\r
701 \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µ
\82½
\81B
\r
702 \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
703 -------------------------------------------------------------------------------
\r
704 \81\9a\83x
\81[
\83X
\81iBASE
\81j: DeleteWorkFromBoth.txt (.
\95s
\95Ï)
\r
705 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: DeleteWorkFromBoth.txt (-
\8dí
\8f\9c)
\r
707 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
708 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
709 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
710 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (-
\8dí
\8f\9c) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
711 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
712 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
713 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
714 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
715 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
717 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
720 \81\9a[WARNING]
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Å
\93à
\97e
\82ª
\93¯
\82¶
\82¾
\82Á
\82½
\82Ì
\82ª
\88Ù
\82È
\82é
\82æ
\82¤
\82É
\82È
\82è
\82Ü
\82µ
\82½
\81B
\r
722 \8cx
\8d\90\82ª
\82 \82è
\82Ü
\82µ
\82½
\82ª
\81A
\82æ
\82ë
\82µ
\82¢
\82Å
\82·
\82©(y/n)y
\r
723 -------------------------------------------------------------------------------
\r
724 >del "%FullPath(..)%\FilesA\Project - Synced\Work\DeleteWorkFromBoth.txt"
\r
725 >copy_ren "%FullPath(..)%\FilesA\Project\Base\DeleteWorkFromBoth.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\DeleteWorkFromBoth.txt"
\r
726 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
727 -------------------------------------------------------------------------------
\r
728 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\DeleteWorkFromBoth.txt"
\r
729 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\DeleteWorkFromBoth.txt"
\r
730 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
731 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
732 -------------------------------------------------------------------------------
\r
733 \81\9a\83x
\81[
\83X
\81iBASE
\81j: DeleteWorkFromBoth.txt (.
\95s
\95Ï)
\r
734 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: DeleteWorkFromBoth.txt (
\82È
\82µ)
\r
736 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
737 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
738 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
739 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
740 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
741 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
742 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
743 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
744 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
747 -------------------------------------------------------------------------------
\r
748 %FullPath(..)%\FilesA\Project - Synced
\r
749 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
750 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
751 -------------------------------------------------------------------------------
\r
752 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
753 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
754 1. - DeleteWorkFromOnly.txt
\r
756 3. +!+ NewNotSame.txt
\r
759 6. - SubForWork\DeleteBaseFromOnly.txt
\r
760 7. - - SubForWork\DeleteBoth.txt
\r
761 8. - SubForWork\DeleteWorkFromOnly.txt
\r
762 9. *!. SubForWork\UpdateBase.txt
\r
763 10. *! SubForWork\UpdateBothSame_ForBase.txt
\r
764 11. !* SubForWork\UpdateBothSame_ForWork.txt
\r
765 12. .!* SubForWork\UpdateWork.txt
\r
766 13. *!. UpdateBase.txt
\r
767 14. *!. UpdateBaseAlmostSame.txt
\r
768 15. *=. UpdateBaseAlmostSameToSame.txt
\r
769 16. *!* UpdateBoth.txt
\r
770 17. *!* UpdateBothAlmostSame.txt
\r
771 18. *=* UpdateSame.txt
\r
772 19. .!* UpdateWork.txt
\r
773 20. .!* UpdateWorkAlmostSame.txt
\r
774 21. .=* UpdateWorkAlmostSameToSame.txt
\r
775 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
777 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
778 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
779 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
780 98.
\81\9a \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é [AutoCommit]
\r
783 -------------------------------------------------------------------------------
\r
784 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\DeleteWorkFromOnly.txt"
\r
785 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\DeleteWorkFromOnly.txt"
\r
786 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
787 \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
788 -------------------------------------------------------------------------------
\r
789 \81\9a\83x
\81[
\83X
\81iBASE
\81j: DeleteWorkFromOnly.txt (
\82È
\82µ)
\r
790 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: DeleteWorkFromOnly.txt (-
\8dí
\8f\9c)
\r
792 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
793 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
794 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
795 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (-
\8dí
\8f\9c) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
796 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
797 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
798 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
799 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
800 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
802 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
804 -------------------------------------------------------------------------------
\r
805 >del "%FullPath(..)%\FilesA\Project - Synced\Work\DeleteWorkFromOnly.txt"
\r
806 >del "%FullPath(..)%\FilesA\Project - Synced\Base\DeleteWorkFromOnly.txt"
\r
807 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
808 -------------------------------------------------------------------------------
\r
809 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\DeleteWorkFromOnly.txt"
\r
810 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\DeleteWorkFromOnly.txt"
\r
812 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
813 -------------------------------------------------------------------------------
\r
814 \81\9a\83x
\81[
\83X
\81iBASE
\81j: DeleteWorkFromOnly.txt (
\82È
\82µ)
\r
815 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: DeleteWorkFromOnly.txt (
\82È
\82µ)
\r
817 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
818 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
819 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
820 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
821 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
822 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
823 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
824 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
825 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
828 -------------------------------------------------------------------------------
\r
829 %FullPath(..)%\FilesA\Project - Synced
\r
830 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
831 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
832 -------------------------------------------------------------------------------
\r
833 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
834 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
836 2. +!+ NewNotSame.txt
\r
839 5. - SubForWork\DeleteBaseFromOnly.txt
\r
840 6. - - SubForWork\DeleteBoth.txt
\r
841 7. - SubForWork\DeleteWorkFromOnly.txt
\r
842 8. *!. SubForWork\UpdateBase.txt
\r
843 9. *! SubForWork\UpdateBothSame_ForBase.txt
\r
844 10. !* SubForWork\UpdateBothSame_ForWork.txt
\r
845 11. .!* SubForWork\UpdateWork.txt
\r
846 12. *!. UpdateBase.txt
\r
847 13. *!. UpdateBaseAlmostSame.txt
\r
848 14. *=. UpdateBaseAlmostSameToSame.txt
\r
849 15. *!* UpdateBoth.txt
\r
850 16. *!* UpdateBothAlmostSame.txt
\r
851 17. *=* UpdateSame.txt
\r
852 18. .!* UpdateWork.txt
\r
853 19. .!* UpdateWorkAlmostSame.txt
\r
854 20. .=* UpdateWorkAlmostSameToSame.txt
\r
855 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
857 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
858 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
859 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
860 98.
\81\9a \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é [AutoCommit]
\r
863 -------------------------------------------------------------------------------
\r
864 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\NewBase.txt"
\r
865 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\NewBase.txt"
\r
867 \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
868 -------------------------------------------------------------------------------
\r
869 \81\9a\83x
\81[
\83X
\81iBASE
\81j: NewBase.txt (+
\90V
\8bK)
\r
870 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: NewBase.txt (
\82È
\82µ)
\r
872 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
873 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
874 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (+
\90V
\8bK) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
875 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
876 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
877 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
878 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
879 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
880 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
882 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
884 -------------------------------------------------------------------------------
\r
885 >del "%FullPath(..)%\FilesA\Project - Synced\Work\NewBase.txt"
\r
886 >copy_ren "%FullPath(..)%\FilesA\Project\Base\NewBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\NewBase.txt"
\r
887 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
888 -------------------------------------------------------------------------------
\r
889 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\NewBase.txt"
\r
890 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\NewBase.txt"
\r
891 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
892 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
893 -------------------------------------------------------------------------------
\r
894 \81\9a\83x
\81[
\83X
\81iBASE
\81j: NewBase.txt (.
\95s
\95Ï)
\r
895 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: NewBase.txt (
\82È
\82µ)
\r
897 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
898 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
899 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
900 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
901 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
902 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
903 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
904 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
905 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
908 -------------------------------------------------------------------------------
\r
909 %FullPath(..)%\FilesA\Project - Synced
\r
910 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
911 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
912 -------------------------------------------------------------------------------
\r
913 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
914 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
915 1. +!+ NewNotSame.txt
\r
918 4. - SubForWork\DeleteBaseFromOnly.txt
\r
919 5. - - SubForWork\DeleteBoth.txt
\r
920 6. - SubForWork\DeleteWorkFromOnly.txt
\r
921 7. *!. SubForWork\UpdateBase.txt
\r
922 8. *! SubForWork\UpdateBothSame_ForBase.txt
\r
923 9. !* SubForWork\UpdateBothSame_ForWork.txt
\r
924 10. .!* SubForWork\UpdateWork.txt
\r
925 11. *!. UpdateBase.txt
\r
926 12. *!. UpdateBaseAlmostSame.txt
\r
927 13. *=. UpdateBaseAlmostSameToSame.txt
\r
928 14. *!* UpdateBoth.txt
\r
929 15. *!* UpdateBothAlmostSame.txt
\r
930 16. *=* UpdateSame.txt
\r
931 17. .!* UpdateWork.txt
\r
932 18. .!* UpdateWorkAlmostSame.txt
\r
933 19. .=* UpdateWorkAlmostSameToSame.txt
\r
934 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
936 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
937 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
938 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
939 98.
\81\9a \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é [AutoCommit]
\r
942 -------------------------------------------------------------------------------
\r
943 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\NewNotSame.txt"
\r
944 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\NewNotSame.txt"
\r
946 \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
947 -------------------------------------------------------------------------------
\r
948 \81\9a\83x
\81[
\83X
\81iBASE
\81j: NewNotSame.txt (+
\90V
\8bK)
\r
949 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: NewNotSame.txt (+
\90V
\8bK)
\r
951 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
952 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
953 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (+
\90V
\8bK) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
954 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (+
\90V
\8bK) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
955 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
956 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
957 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
958 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
959 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
961 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
963 -------------------------------------------------------------------------------
\r
964 >copy_ren "%FullPath(..)%\FilesA\Project\Work\NewNotSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\NewNotSame.txt"
\r
965 >copy_ren "%FullPath(..)%\FilesA\Project\Base\NewNotSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\NewNotSame.txt"
\r
966 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
967 -------------------------------------------------------------------------------
\r
968 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\NewNotSame.txt"
\r
969 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\NewNotSame.txt"
\r
970 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
971 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
972 -------------------------------------------------------------------------------
\r
973 \81\9a\83x
\81[
\83X
\81iBASE
\81j: NewNotSame.txt (.
\95s
\95Ï)
\r
974 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: NewNotSame.txt (.
\95s
\95Ï)
\r
976 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
977 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
978 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
979 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
980 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
981 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
982 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
983 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
984 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
987 -------------------------------------------------------------------------------
\r
988 %FullPath(..)%\FilesA\Project - Synced
\r
989 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
990 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
991 -------------------------------------------------------------------------------
\r
992 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
993 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
996 3. - SubForWork\DeleteBaseFromOnly.txt
\r
997 4. - - SubForWork\DeleteBoth.txt
\r
998 5. - SubForWork\DeleteWorkFromOnly.txt
\r
999 6. *!. SubForWork\UpdateBase.txt
\r
1000 7. *! SubForWork\UpdateBothSame_ForBase.txt
\r
1001 8. !* SubForWork\UpdateBothSame_ForWork.txt
\r
1002 9. .!* SubForWork\UpdateWork.txt
\r
1003 10. *!. UpdateBase.txt
\r
1004 11. *!. UpdateBaseAlmostSame.txt
\r
1005 12. *=. UpdateBaseAlmostSameToSame.txt
\r
1006 13. *!* UpdateBoth.txt
\r
1007 14. *!* UpdateBothAlmostSame.txt
\r
1008 15. *=* UpdateSame.txt
\r
1009 16. .!* UpdateWork.txt
\r
1010 17. .!* UpdateWorkAlmostSame.txt
\r
1011 18. .=* UpdateWorkAlmostSameToSame.txt
\r
1012 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1014 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1015 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1016 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1017 98.
\81\9a \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é [AutoCommit]
\r
1020 -------------------------------------------------------------------------------
\r
1021 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\NewSame.txt"
\r
1022 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\NewSame.txt"
\r
1024 \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
1025 -------------------------------------------------------------------------------
\r
1026 \81\9a\83x
\81[
\83X
\81iBASE
\81j: NewSame.txt (+
\90V
\8bK)
\r
1027 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: NewSame.txt (+
\90V
\8bK)
\r
1029 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
1030 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1031 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (+
\90V
\8bK) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1032 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (+
\90V
\8bK) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1033 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
1034 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1035 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1036 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1037 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1039 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
1041 -------------------------------------------------------------------------------
\r
1042 >copy_ren "%FullPath(..)%\FilesA\Project\Work\NewSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\NewSame.txt"
\r
1043 >copy_ren "%FullPath(..)%\FilesA\Project\Base\NewSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\NewSame.txt"
\r
1044 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1045 -------------------------------------------------------------------------------
\r
1046 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\NewSame.txt"
\r
1047 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\NewSame.txt"
\r
1048 \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µ
\82½
\81B
\r
1049 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1050 -------------------------------------------------------------------------------
\r
1051 \81\9a\83x
\81[
\83X
\81iBASE
\81j: NewSame.txt (.
\95s
\95Ï)
\r
1052 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: NewSame.txt (.
\95s
\95Ï)
\r
1054 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
1055 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
1056 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1057 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1058 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
1059 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1060 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1061 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1062 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1065 -------------------------------------------------------------------------------
\r
1066 %FullPath(..)%\FilesA\Project - Synced
\r
1067 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1068 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1069 -------------------------------------------------------------------------------
\r
1070 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1071 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1073 2. - SubForWork\DeleteBaseFromOnly.txt
\r
1074 3. - - SubForWork\DeleteBoth.txt
\r
1075 4. - SubForWork\DeleteWorkFromOnly.txt
\r
1076 5. *!. SubForWork\UpdateBase.txt
\r
1077 6. *! SubForWork\UpdateBothSame_ForBase.txt
\r
1078 7. !* SubForWork\UpdateBothSame_ForWork.txt
\r
1079 8. .!* SubForWork\UpdateWork.txt
\r
1080 9. *!. UpdateBase.txt
\r
1081 10. *!. UpdateBaseAlmostSame.txt
\r
1082 11. *=. UpdateBaseAlmostSameToSame.txt
\r
1083 12. *!* UpdateBoth.txt
\r
1084 13. *!* UpdateBothAlmostSame.txt
\r
1085 14. *=* UpdateSame.txt
\r
1086 15. .!* UpdateWork.txt
\r
1087 16. .!* UpdateWorkAlmostSame.txt
\r
1088 17. .=* UpdateWorkAlmostSameToSame.txt
\r
1089 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1091 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1092 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1093 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1094 98.
\81\9a \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é [AutoCommit]
\r
1097 -------------------------------------------------------------------------------
\r
1098 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\NewWork.txt"
\r
1099 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\NewWork.txt"
\r
1101 \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
1102 -------------------------------------------------------------------------------
\r
1103 \81\9a\83x
\81[
\83X
\81iBASE
\81j: NewWork.txt (
\82È
\82µ)
\r
1104 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: NewWork.txt (+
\90V
\8bK)
\r
1106 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1107 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1108 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1109 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (+
\90V
\8bK) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1110 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
1111 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1112 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1113 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1114 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1116 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
1118 -------------------------------------------------------------------------------
\r
1119 >copy_ren "%FullPath(..)%\FilesA\Project\Work\NewWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\NewWork.txt"
\r
1120 >del "%FullPath(..)%\FilesA\Project - Synced\Base\NewWork.txt"
\r
1121 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1122 -------------------------------------------------------------------------------
\r
1123 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\NewWork.txt"
\r
1124 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\NewWork.txt"
\r
1125 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1126 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1127 -------------------------------------------------------------------------------
\r
1128 \81\9a\83x
\81[
\83X
\81iBASE
\81j: NewWork.txt (
\82È
\82µ)
\r
1129 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: NewWork.txt (.
\95s
\95Ï)
\r
1131 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1132 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1133 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1134 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1135 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
1136 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1137 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1138 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1139 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1142 -------------------------------------------------------------------------------
\r
1143 %FullPath(..)%\FilesA\Project - Synced
\r
1144 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1145 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1146 -------------------------------------------------------------------------------
\r
1147 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1148 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1149 1. - SubForWork\DeleteBaseFromOnly.txt
\r
1150 2. - - SubForWork\DeleteBoth.txt
\r
1151 3. - SubForWork\DeleteWorkFromOnly.txt
\r
1152 4. *!. SubForWork\UpdateBase.txt
\r
1153 5. *! SubForWork\UpdateBothSame_ForBase.txt
\r
1154 6. !* SubForWork\UpdateBothSame_ForWork.txt
\r
1155 7. .!* SubForWork\UpdateWork.txt
\r
1156 8. *!. UpdateBase.txt
\r
1157 9. *!. UpdateBaseAlmostSame.txt
\r
1158 10. *=. UpdateBaseAlmostSameToSame.txt
\r
1159 11. *!* UpdateBoth.txt
\r
1160 12. *!* UpdateBothAlmostSame.txt
\r
1161 13. *=* UpdateSame.txt
\r
1162 14. .!* UpdateWork.txt
\r
1163 15. .!* UpdateWorkAlmostSame.txt
\r
1164 16. .=* UpdateWorkAlmostSameToSame.txt
\r
1165 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1167 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1168 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1169 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1170 98.
\81\9a \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é [AutoCommit]
\r
1173 -------------------------------------------------------------------------------
\r
1174 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\DeleteBaseFromOnly.txt"
\r
1175 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\DeleteBaseFromOnly.txt"
\r
1176 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1177 \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
1178 -------------------------------------------------------------------------------
\r
1179 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\DeleteBaseFromOnly.txt (-
\8dí
\8f\9c)
\r
1180 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\DeleteBaseFromOnly.txt (
\82È
\82µ)
\r
1182 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1183 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1184 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (-
\8dí
\8f\9c) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1185 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1186 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
1187 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1188 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1189 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1190 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1192 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
1194 -------------------------------------------------------------------------------
\r
1195 >del "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\DeleteBaseFromOnly.txt"
\r
1196 >del "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\DeleteBaseFromOnly.txt"
\r
1197 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1198 -------------------------------------------------------------------------------
\r
1199 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\DeleteBaseFromOnly.txt"
\r
1200 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\DeleteBaseFromOnly.txt"
\r
1202 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1203 -------------------------------------------------------------------------------
\r
1204 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\DeleteBaseFromOnly.txt (
\82È
\82µ)
\r
1205 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\DeleteBaseFromOnly.txt (
\82È
\82µ)
\r
1207 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1208 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1209 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1210 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1211 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
1212 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1213 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1214 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1215 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1218 -------------------------------------------------------------------------------
\r
1219 %FullPath(..)%\FilesA\Project - Synced
\r
1220 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1221 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1222 -------------------------------------------------------------------------------
\r
1223 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1224 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1225 1. - - SubForWork\DeleteBoth.txt
\r
1226 2. - SubForWork\DeleteWorkFromOnly.txt
\r
1227 3. *!. SubForWork\UpdateBase.txt
\r
1228 4. *! SubForWork\UpdateBothSame_ForBase.txt
\r
1229 5. !* SubForWork\UpdateBothSame_ForWork.txt
\r
1230 6. .!* SubForWork\UpdateWork.txt
\r
1231 7. *!. UpdateBase.txt
\r
1232 8. *!. UpdateBaseAlmostSame.txt
\r
1233 9. *=. UpdateBaseAlmostSameToSame.txt
\r
1234 10. *!* UpdateBoth.txt
\r
1235 11. *!* UpdateBothAlmostSame.txt
\r
1236 12. *=* UpdateSame.txt
\r
1237 13. .!* UpdateWork.txt
\r
1238 14. .!* UpdateWorkAlmostSame.txt
\r
1239 15. .=* UpdateWorkAlmostSameToSame.txt
\r
1240 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1242 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1243 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1244 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1245 98.
\81\9a \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é [AutoCommit]
\r
1248 -------------------------------------------------------------------------------
\r
1249 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\DeleteBoth.txt"
\r
1250 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\DeleteBoth.txt"
\r
1251 \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µ
\82½
\81B
\r
1252 \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
1253 -------------------------------------------------------------------------------
\r
1254 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\DeleteBoth.txt (-
\8dí
\8f\9c)
\r
1255 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\DeleteBoth.txt (-
\8dí
\8f\9c)
\r
1257 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1258 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
1259 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (-
\8dí
\8f\9c) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1260 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (-
\8dí
\8f\9c) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1261 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
1262 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1263 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1264 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1265 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1267 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
1269 -------------------------------------------------------------------------------
\r
1270 >del "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\DeleteBoth.txt"
\r
1271 >del "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\DeleteBoth.txt"
\r
1272 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1273 -------------------------------------------------------------------------------
\r
1274 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\DeleteBoth.txt"
\r
1275 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\DeleteBoth.txt"
\r
1277 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1278 -------------------------------------------------------------------------------
\r
1279 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\DeleteBoth.txt (
\82È
\82µ)
\r
1280 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\DeleteBoth.txt (
\82È
\82µ)
\r
1282 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1283 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1284 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1285 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1286 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
1287 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1288 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1289 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1290 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1293 -------------------------------------------------------------------------------
\r
1294 %FullPath(..)%\FilesA\Project - Synced
\r
1295 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1296 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1297 -------------------------------------------------------------------------------
\r
1298 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1299 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1300 1. - SubForWork\DeleteWorkFromOnly.txt
\r
1301 2. *!. SubForWork\UpdateBase.txt
\r
1302 3. *! SubForWork\UpdateBothSame_ForBase.txt
\r
1303 4. !* SubForWork\UpdateBothSame_ForWork.txt
\r
1304 5. .!* SubForWork\UpdateWork.txt
\r
1305 6. *!. UpdateBase.txt
\r
1306 7. *!. UpdateBaseAlmostSame.txt
\r
1307 8. *=. UpdateBaseAlmostSameToSame.txt
\r
1308 9. *!* UpdateBoth.txt
\r
1309 10. *!* UpdateBothAlmostSame.txt
\r
1310 11. *=* UpdateSame.txt
\r
1311 12. .!* UpdateWork.txt
\r
1312 13. .!* UpdateWorkAlmostSame.txt
\r
1313 14. .=* UpdateWorkAlmostSameToSame.txt
\r
1314 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1316 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1317 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1318 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1319 98.
\81\9a \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é [AutoCommit]
\r
1322 -------------------------------------------------------------------------------
\r
1323 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\DeleteWorkFromOnly.txt"
\r
1324 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\DeleteWorkFromOnly.txt"
\r
1325 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1326 \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
1327 -------------------------------------------------------------------------------
\r
1328 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\DeleteWorkFromOnly.txt (
\82È
\82µ)
\r
1329 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\DeleteWorkFromOnly.txt (-
\8dí
\8f\9c)
\r
1331 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1332 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1333 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1334 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (-
\8dí
\8f\9c) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1335 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
1336 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1337 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1338 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1339 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1341 \81\9a\89ü
\96¼
\81E
\8c\8b\8d\87\81E
\95ª
\97£
\81E
\95\94\95ª
\88Ú
\93®
\82ª
\82 \82Á
\82½
\82Æ
\82«
\82Ì SyncFilesX
\82Ì
\90à
\96¾
\82ð
\8eQ
\8dl
\81B
\r
1343 -------------------------------------------------------------------------------
\r
1344 >del "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\DeleteWorkFromOnly.txt"
\r
1345 >del "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\DeleteWorkFromOnly.txt"
\r
1346 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1347 -------------------------------------------------------------------------------
\r
1348 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\DeleteWorkFromOnly.txt"
\r
1349 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\DeleteWorkFromOnly.txt"
\r
1351 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1352 -------------------------------------------------------------------------------
\r
1353 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\DeleteWorkFromOnly.txt (
\82È
\82µ)
\r
1354 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\DeleteWorkFromOnly.txt (
\82È
\82µ)
\r
1356 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1357 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (
\82È
\82µ) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1358 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1359 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1360 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
1361 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1362 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1363 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1364 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1367 -------------------------------------------------------------------------------
\r
1368 %FullPath(..)%\FilesA\Project - Synced
\r
1369 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1370 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1371 -------------------------------------------------------------------------------
\r
1372 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1373 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1374 1. *!. SubForWork\UpdateBase.txt
\r
1375 2. *! SubForWork\UpdateBothSame_ForBase.txt
\r
1376 3. !* SubForWork\UpdateBothSame_ForWork.txt
\r
1377 4. .!* SubForWork\UpdateWork.txt
\r
1378 5. *!. UpdateBase.txt
\r
1379 6. *!. UpdateBaseAlmostSame.txt
\r
1380 7. *=. UpdateBaseAlmostSameToSame.txt
\r
1381 8. *!* UpdateBoth.txt
\r
1382 9. *!* UpdateBothAlmostSame.txt
\r
1383 10. *=* UpdateSame.txt
\r
1384 11. .!* UpdateWork.txt
\r
1385 12. .!* UpdateWorkAlmostSame.txt
\r
1386 13. .=* UpdateWorkAlmostSameToSame.txt
\r
1387 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1389 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1390 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1391 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1392 98.
\81\9a \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é [AutoCommit]
\r
1395 -------------------------------------------------------------------------------
\r
1396 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBase.txt"
\r
1397 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBase.txt"
\r
1398 \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µ
\82½
\81B
\r
1399 \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
1400 -------------------------------------------------------------------------------
\r
1401 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\UpdateBase.txt (*
\95Ï
\8dX)
\r
1402 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\UpdateBase.txt (.
\95s
\95Ï)
\r
1404 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1405 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
1406 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1407 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1408 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
1409 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1410 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1411 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1412 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1416 \81\9a[WARNING]
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Å
\93à
\97e
\82ª
\93¯
\82¶
\82¾
\82Á
\82½
\82Ì
\82ª
\88Ù
\82È
\82é
\82æ
\82¤
\82É
\82È
\82è
\82Ü
\82µ
\82½
\81B
\r
1418 \8cx
\8d\90\82ª
\82 \82è
\82Ü
\82µ
\82½
\82ª
\81A
\82æ
\82ë
\82µ
\82¢
\82Å
\82·
\82©(y/n)y
\r
1419 -------------------------------------------------------------------------------
\r
1420 >copy_ren "%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\UpdateBase.txt"
\r
1421 >copy_ren "%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\UpdateBase.txt"
\r
1422 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1423 -------------------------------------------------------------------------------
\r
1424 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBase.txt"
\r
1425 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBase.txt"
\r
1426 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1427 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1428 -------------------------------------------------------------------------------
\r
1429 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\UpdateBase.txt (.
\95s
\95Ï)
\r
1430 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\UpdateBase.txt (.
\95s
\95Ï)
\r
1432 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1433 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1434 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1435 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1436 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
1437 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1438 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1439 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1440 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1443 -------------------------------------------------------------------------------
\r
1444 %FullPath(..)%\FilesA\Project - Synced
\r
1445 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1446 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1447 -------------------------------------------------------------------------------
\r
1448 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1449 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1450 1. *! SubForWork\UpdateBothSame_ForBase.txt
\r
1451 2. !* SubForWork\UpdateBothSame_ForWork.txt
\r
1452 3. .!* SubForWork\UpdateWork.txt
\r
1453 4. *!. UpdateBase.txt
\r
1454 5. *!. UpdateBaseAlmostSame.txt
\r
1455 6. *=. UpdateBaseAlmostSameToSame.txt
\r
1456 7. *!* UpdateBoth.txt
\r
1457 8. *!* UpdateBothAlmostSame.txt
\r
1458 9. *=* UpdateSame.txt
\r
1459 10. .!* UpdateWork.txt
\r
1460 11. .!* UpdateWorkAlmostSame.txt
\r
1461 12. .=* UpdateWorkAlmostSameToSame.txt
\r
1462 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1464 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1465 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1466 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1467 98.
\81\9a \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é [AutoCommit]
\r
1470 -------------------------------------------------------------------------------
\r
1471 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForBase.txt"
\r
1472 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForBase.txt"
\r
1473 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1474 \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
1475 -------------------------------------------------------------------------------
\r
1476 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\UpdateBothSame_ForBase.txt (*
\95Ï
\8dX)
\r
1477 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\UpdateBothSame_ForBase.txt (
\82È
\82µ)
\r
1479 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1480 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1481 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1482 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1483 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
1484 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1485 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1486 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1487 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1490 -------------------------------------------------------------------------------
\r
1491 >del "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\UpdateBothSame_ForBase.txt"
\r
1492 >copy_ren "%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\UpdateBothSame_ForBase.txt"
\r
1493 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1494 -------------------------------------------------------------------------------
\r
1495 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForBase.txt"
\r
1496 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForBase.txt"
\r
1497 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1498 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1499 -------------------------------------------------------------------------------
\r
1500 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\UpdateBothSame_ForBase.txt (.
\95s
\95Ï)
\r
1501 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\UpdateBothSame_ForBase.txt (
\82È
\82µ)
\r
1503 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1504 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1505 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1506 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1507 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
1508 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1509 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1510 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1511 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1514 -------------------------------------------------------------------------------
\r
1515 %FullPath(..)%\FilesA\Project - Synced
\r
1516 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1517 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1518 -------------------------------------------------------------------------------
\r
1519 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1520 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1521 1. !* SubForWork\UpdateBothSame_ForWork.txt
\r
1522 2. .!* SubForWork\UpdateWork.txt
\r
1523 3. *!. UpdateBase.txt
\r
1524 4. *!. UpdateBaseAlmostSame.txt
\r
1525 5. *=. UpdateBaseAlmostSameToSame.txt
\r
1526 6. *!* UpdateBoth.txt
\r
1527 7. *!* UpdateBothAlmostSame.txt
\r
1528 8. *=* UpdateSame.txt
\r
1529 9. .!* UpdateWork.txt
\r
1530 10. .!* UpdateWorkAlmostSame.txt
\r
1531 11. .=* UpdateWorkAlmostSameToSame.txt
\r
1532 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1534 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1535 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1536 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1537 98.
\81\9a \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é [AutoCommit]
\r
1540 -------------------------------------------------------------------------------
\r
1541 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForWork.txt"
\r
1542 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForWork.txt"
\r
1543 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1544 \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
1545 -------------------------------------------------------------------------------
\r
1546 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\UpdateBothSame_ForWork.txt (
\82È
\82µ)
\r
1547 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\UpdateBothSame_ForWork.txt (*
\95Ï
\8dX)
\r
1549 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1550 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1551 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1552 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1553 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
1554 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1555 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1556 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1557 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1560 -------------------------------------------------------------------------------
\r
1561 >copy_ren "%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\UpdateBothSame_ForWork.txt"
\r
1562 >del "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\UpdateBothSame_ForWork.txt"
\r
1563 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1564 -------------------------------------------------------------------------------
\r
1565 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForWork.txt"
\r
1566 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForWork.txt"
\r
1567 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1568 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1569 -------------------------------------------------------------------------------
\r
1570 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\UpdateBothSame_ForWork.txt (
\82È
\82µ)
\r
1571 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\UpdateBothSame_ForWork.txt (.
\95s
\95Ï)
\r
1573 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1574 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1575 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (
\82È
\82µ) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1576 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1577 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
1578 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1579 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1580 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1581 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1584 -------------------------------------------------------------------------------
\r
1585 %FullPath(..)%\FilesA\Project - Synced
\r
1586 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1587 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1588 -------------------------------------------------------------------------------
\r
1589 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1590 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1591 1. .!* SubForWork\UpdateWork.txt
\r
1592 2. *!. UpdateBase.txt
\r
1593 3. *!. UpdateBaseAlmostSame.txt
\r
1594 4. *=. UpdateBaseAlmostSameToSame.txt
\r
1595 5. *!* UpdateBoth.txt
\r
1596 6. *!* UpdateBothAlmostSame.txt
\r
1597 7. *=* UpdateSame.txt
\r
1598 8. .!* UpdateWork.txt
\r
1599 9. .!* UpdateWorkAlmostSame.txt
\r
1600 10. .=* UpdateWorkAlmostSameToSame.txt
\r
1601 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1603 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1604 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1605 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1606 98.
\81\9a \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é [AutoCommit]
\r
1609 -------------------------------------------------------------------------------
\r
1610 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateWork.txt"
\r
1611 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateWork.txt"
\r
1612 \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µ
\82½
\81B
\r
1613 \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
1614 -------------------------------------------------------------------------------
\r
1615 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\UpdateWork.txt (.
\95s
\95Ï)
\r
1616 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\UpdateWork.txt (*
\95Ï
\8dX)
\r
1618 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1619 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
1620 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1621 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1622 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
1623 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1624 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1625 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1626 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1630 \81\9a[WARNING]
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Å
\93à
\97e
\82ª
\93¯
\82¶
\82¾
\82Á
\82½
\82Ì
\82ª
\88Ù
\82È
\82é
\82æ
\82¤
\82É
\82È
\82è
\82Ü
\82µ
\82½
\81B
\r
1632 \8cx
\8d\90\82ª
\82 \82è
\82Ü
\82µ
\82½
\82ª
\81A
\82æ
\82ë
\82µ
\82¢
\82Å
\82·
\82©(y/n)y
\r
1633 -------------------------------------------------------------------------------
\r
1634 >copy_ren "%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\UpdateWork.txt"
\r
1635 >copy_ren "%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\UpdateWork.txt"
\r
1636 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1637 -------------------------------------------------------------------------------
\r
1638 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateWork.txt"
\r
1639 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateWork.txt"
\r
1640 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1641 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1642 -------------------------------------------------------------------------------
\r
1643 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\UpdateWork.txt (.
\95s
\95Ï)
\r
1644 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\UpdateWork.txt (.
\95s
\95Ï)
\r
1646 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1647 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1648 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1649 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1650 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
1651 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1652 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1653 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1654 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1657 -------------------------------------------------------------------------------
\r
1658 %FullPath(..)%\FilesA\Project - Synced
\r
1659 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1660 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1661 -------------------------------------------------------------------------------
\r
1662 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1663 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1664 1. *!. UpdateBase.txt
\r
1665 2. *!. UpdateBaseAlmostSame.txt
\r
1666 3. *=. UpdateBaseAlmostSameToSame.txt
\r
1667 4. *!* UpdateBoth.txt
\r
1668 5. *!* UpdateBothAlmostSame.txt
\r
1669 6. *=* UpdateSame.txt
\r
1670 7. .!* UpdateWork.txt
\r
1671 8. .!* UpdateWorkAlmostSame.txt
\r
1672 9. .=* UpdateWorkAlmostSameToSame.txt
\r
1673 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1675 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1676 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1677 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1678 98.
\81\9a \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é [AutoCommit]
\r
1681 -------------------------------------------------------------------------------
\r
1682 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBase.txt"
\r
1683 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBase.txt"
\r
1684 \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µ
\82½
\81B
\r
1685 \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
1686 -------------------------------------------------------------------------------
\r
1687 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateBase.txt (*
\95Ï
\8dX)
\r
1688 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateBase.txt (.
\95s
\95Ï)
\r
1690 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1691 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
1692 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1693 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1694 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
1695 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1696 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1697 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1698 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1702 \81\9a[WARNING]
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Å
\93à
\97e
\82ª
\93¯
\82¶
\82¾
\82Á
\82½
\82Ì
\82ª
\88Ù
\82È
\82é
\82æ
\82¤
\82É
\82È
\82è
\82Ü
\82µ
\82½
\81B
\r
1704 \8cx
\8d\90\82ª
\82 \82è
\82Ü
\82µ
\82½
\82ª
\81A
\82æ
\82ë
\82µ
\82¢
\82Å
\82·
\82©(y/n)y
\r
1705 -------------------------------------------------------------------------------
\r
1706 >copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateBase.txt"
\r
1707 >copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateBase.txt"
\r
1708 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1709 -------------------------------------------------------------------------------
\r
1710 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBase.txt"
\r
1711 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBase.txt"
\r
1712 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1713 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1714 -------------------------------------------------------------------------------
\r
1715 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateBase.txt (.
\95s
\95Ï)
\r
1716 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateBase.txt (.
\95s
\95Ï)
\r
1718 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1719 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1720 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1721 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1722 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
1723 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1724 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1725 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1726 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1729 -------------------------------------------------------------------------------
\r
1730 %FullPath(..)%\FilesA\Project - Synced
\r
1731 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1732 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1733 -------------------------------------------------------------------------------
\r
1734 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1735 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1736 1. *!. UpdateBaseAlmostSame.txt
\r
1737 2. *=. UpdateBaseAlmostSameToSame.txt
\r
1738 3. *!* UpdateBoth.txt
\r
1739 4. *!* UpdateBothAlmostSame.txt
\r
1740 5. *=* UpdateSame.txt
\r
1741 6. .!* UpdateWork.txt
\r
1742 7. .!* UpdateWorkAlmostSame.txt
\r
1743 8. .=* UpdateWorkAlmostSameToSame.txt
\r
1744 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1746 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1747 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1748 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1749 98.
\81\9a \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é [AutoCommit]
\r
1752 -------------------------------------------------------------------------------
\r
1753 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBaseAlmostSame.txt"
\r
1754 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBaseAlmostSame.txt"
\r
1755 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1756 \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
1757 -------------------------------------------------------------------------------
\r
1758 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateBaseAlmostSame.txt (*
\95Ï
\8dX)
\r
1759 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateBaseAlmostSame.txt (.
\95s
\95Ï)
\r
1761 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1762 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1763 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1764 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1765 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
1766 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1767 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1768 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1769 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1772 -------------------------------------------------------------------------------
\r
1773 >copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateBaseAlmostSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateBaseAlmostSame.txt"
\r
1774 >copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateBaseAlmostSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateBaseAlmostSame.txt"
\r
1775 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1776 -------------------------------------------------------------------------------
\r
1777 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBaseAlmostSame.txt"
\r
1778 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBaseAlmostSame.txt"
\r
1779 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1780 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1781 -------------------------------------------------------------------------------
\r
1782 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateBaseAlmostSame.txt (.
\95s
\95Ï)
\r
1783 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateBaseAlmostSame.txt (.
\95s
\95Ï)
\r
1785 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1786 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1787 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1788 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1789 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
1790 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1791 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1792 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1793 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1796 -------------------------------------------------------------------------------
\r
1797 %FullPath(..)%\FilesA\Project - Synced
\r
1798 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1799 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1800 -------------------------------------------------------------------------------
\r
1801 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1802 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1803 1. *=. UpdateBaseAlmostSameToSame.txt
\r
1804 2. *!* UpdateBoth.txt
\r
1805 3. *!* UpdateBothAlmostSame.txt
\r
1806 4. *=* UpdateSame.txt
\r
1807 5. .!* UpdateWork.txt
\r
1808 6. .!* UpdateWorkAlmostSame.txt
\r
1809 7. .=* UpdateWorkAlmostSameToSame.txt
\r
1810 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1812 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1813 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1814 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1815 98.
\81\9a \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é [AutoCommit]
\r
1818 -------------------------------------------------------------------------------
\r
1819 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBaseAlmostSameToSame.txt"
\r
1820 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBaseAlmostSameToSame.txt"
\r
1821 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1822 \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
1823 -------------------------------------------------------------------------------
\r
1824 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateBaseAlmostSameToSame.txt (*
\95Ï
\8dX)
\r
1825 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateBaseAlmostSameToSame.txt (.
\95s
\95Ï)
\r
1827 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
1828 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1829 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1830 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1831 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
1832 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1833 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1834 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1835 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1839 \81\9a[WARNING]
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Å
\93à
\97e
\82ª
\88Ù
\82È
\82Á
\82Ä
\82¢
\82½
\82Ì
\82ª
\93¯
\82¶
\82É
\82È
\82è
\82Ü
\82µ
\82½
\81B
\r
1841 \8cx
\8d\90\82ª
\82 \82è
\82Ü
\82µ
\82½
\82ª
\81A
\82æ
\82ë
\82µ
\82¢
\82Å
\82·
\82©(y/n)y
\r
1842 -------------------------------------------------------------------------------
\r
1843 >copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateBaseAlmostSameToSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateBaseAlmostSameToSame.txt"
\r
1844 >copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateBaseAlmostSameToSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateBaseAlmostSameToSame.txt"
\r
1845 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1846 -------------------------------------------------------------------------------
\r
1847 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBaseAlmostSameToSame.txt"
\r
1848 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBaseAlmostSameToSame.txt"
\r
1849 \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µ
\82½
\81B
\r
1850 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1851 -------------------------------------------------------------------------------
\r
1852 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateBaseAlmostSameToSame.txt (.
\95s
\95Ï)
\r
1853 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateBaseAlmostSameToSame.txt (.
\95s
\95Ï)
\r
1855 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
1856 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
1857 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1858 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1859 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
1860 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1861 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1862 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1863 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1866 -------------------------------------------------------------------------------
\r
1867 %FullPath(..)%\FilesA\Project - Synced
\r
1868 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1869 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1870 -------------------------------------------------------------------------------
\r
1871 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1872 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1873 1. *!* UpdateBoth.txt
\r
1874 2. *!* UpdateBothAlmostSame.txt
\r
1875 3. *=* UpdateSame.txt
\r
1876 4. .!* UpdateWork.txt
\r
1877 5. .!* UpdateWorkAlmostSame.txt
\r
1878 6. .=* UpdateWorkAlmostSameToSame.txt
\r
1879 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1881 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1882 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1883 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1884 98.
\81\9a \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é [AutoCommit]
\r
1887 -------------------------------------------------------------------------------
\r
1888 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBoth.txt"
\r
1889 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBoth.txt"
\r
1890 \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µ
\82½
\81B
\r
1891 \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
1892 -------------------------------------------------------------------------------
\r
1893 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateBoth.txt (*
\95Ï
\8dX)
\r
1894 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateBoth.txt (*
\95Ï
\8dX)
\r
1896 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1897 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
1898 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1899 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1900 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
1901 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1902 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1903 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1904 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1908 \81\9a[WARNING]
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Å
\93à
\97e
\82ª
\93¯
\82¶
\82¾
\82Á
\82½
\82Ì
\82ª
\88Ù
\82È
\82é
\82æ
\82¤
\82É
\82È
\82è
\82Ü
\82µ
\82½
\81B
\r
1910 \8cx
\8d\90\82ª
\82 \82è
\82Ü
\82µ
\82½
\82ª
\81A
\82æ
\82ë
\82µ
\82¢
\82Å
\82·
\82©(y/n)y
\r
1911 -------------------------------------------------------------------------------
\r
1912 >copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateBoth.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateBoth.txt"
\r
1913 >copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateBoth.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateBoth.txt"
\r
1914 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1915 -------------------------------------------------------------------------------
\r
1916 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBoth.txt"
\r
1917 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBoth.txt"
\r
1918 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1919 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1920 -------------------------------------------------------------------------------
\r
1921 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateBoth.txt (.
\95s
\95Ï)
\r
1922 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateBoth.txt (.
\95s
\95Ï)
\r
1924 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1925 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1926 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1927 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1928 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
1929 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1930 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1931 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1932 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1935 -------------------------------------------------------------------------------
\r
1936 %FullPath(..)%\FilesA\Project - Synced
\r
1937 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
1938 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
1939 -------------------------------------------------------------------------------
\r
1940 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
1941 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
1942 1. *!* UpdateBothAlmostSame.txt
\r
1943 2. *=* UpdateSame.txt
\r
1944 3. .!* UpdateWork.txt
\r
1945 4. .!* UpdateWorkAlmostSame.txt
\r
1946 5. .=* UpdateWorkAlmostSameToSame.txt
\r
1947 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
1949 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
1950 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1951 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
1952 98.
\81\9a \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é [AutoCommit]
\r
1955 -------------------------------------------------------------------------------
\r
1956 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBothAlmostSame.txt"
\r
1957 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBothAlmostSame.txt"
\r
1958 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1959 \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
1960 -------------------------------------------------------------------------------
\r
1961 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateBothAlmostSame.txt (*
\95Ï
\8dX)
\r
1962 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateBothAlmostSame.txt (*
\95Ï
\8dX)
\r
1964 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1965 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1966 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1967 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1968 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
1969 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1970 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1971 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1972 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1975 -------------------------------------------------------------------------------
\r
1976 >copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateBothAlmostSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateBothAlmostSame.txt"
\r
1977 >copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateBothAlmostSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateBothAlmostSame.txt"
\r
1978 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1979 -------------------------------------------------------------------------------
\r
1980 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateBothAlmostSame.txt"
\r
1981 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateBothAlmostSame.txt"
\r
1982 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
1983 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
1984 -------------------------------------------------------------------------------
\r
1985 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateBothAlmostSame.txt (.
\95s
\95Ï)
\r
1986 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateBothAlmostSame.txt (.
\95s
\95Ï)
\r
1988 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1989 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
1990 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1991 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
1992 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
1993 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
1994 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
1995 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
1996 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
1999 -------------------------------------------------------------------------------
\r
2000 %FullPath(..)%\FilesA\Project - Synced
\r
2001 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
2002 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
2003 -------------------------------------------------------------------------------
\r
2004 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
2005 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
2006 1. *=* UpdateSame.txt
\r
2007 2. .!* UpdateWork.txt
\r
2008 3. .!* UpdateWorkAlmostSame.txt
\r
2009 4. .=* UpdateWorkAlmostSameToSame.txt
\r
2010 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
2012 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
2013 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2014 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
2015 98.
\81\9a \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é [AutoCommit]
\r
2018 -------------------------------------------------------------------------------
\r
2019 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateSame.txt"
\r
2020 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateSame.txt"
\r
2021 \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µ
\82½
\81B
\r
2022 \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
2023 -------------------------------------------------------------------------------
\r
2024 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateSame.txt (*
\95Ï
\8dX)
\r
2025 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateSame.txt (*
\95Ï
\8dX)
\r
2027 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
2028 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
2029 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2030 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2031 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
2032 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
2033 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2034 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
2035 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
2038 -------------------------------------------------------------------------------
\r
2039 >copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateSame.txt"
\r
2040 >copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateSame.txt"
\r
2041 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
2042 -------------------------------------------------------------------------------
\r
2043 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateSame.txt"
\r
2044 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateSame.txt"
\r
2045 \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µ
\82½
\81B
\r
2046 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
2047 -------------------------------------------------------------------------------
\r
2048 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateSame.txt (.
\95s
\95Ï)
\r
2049 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateSame.txt (.
\95s
\95Ï)
\r
2051 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
2052 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
2053 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2054 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2055 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
2056 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
2057 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2058 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
2059 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
2062 -------------------------------------------------------------------------------
\r
2063 %FullPath(..)%\FilesA\Project - Synced
\r
2064 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
2065 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
2066 -------------------------------------------------------------------------------
\r
2067 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
2068 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
2069 1. .!* UpdateWork.txt
\r
2070 2. .!* UpdateWorkAlmostSame.txt
\r
2071 3. .=* UpdateWorkAlmostSameToSame.txt
\r
2072 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
2074 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
2075 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2076 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
2077 98.
\81\9a \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é [AutoCommit]
\r
2080 -------------------------------------------------------------------------------
\r
2081 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateWork.txt"
\r
2082 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateWork.txt"
\r
2083 \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µ
\82½
\81B
\r
2084 \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
2085 -------------------------------------------------------------------------------
\r
2086 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateWork.txt (.
\95s
\95Ï)
\r
2087 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateWork.txt (*
\95Ï
\8dX)
\r
2089 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
2090 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
2091 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2092 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2093 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
2094 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
2095 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2096 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
2097 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
2101 \81\9a[WARNING]
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Å
\93à
\97e
\82ª
\93¯
\82¶
\82¾
\82Á
\82½
\82Ì
\82ª
\88Ù
\82È
\82é
\82æ
\82¤
\82É
\82È
\82è
\82Ü
\82µ
\82½
\81B
\r
2103 \8cx
\8d\90\82ª
\82 \82è
\82Ü
\82µ
\82½
\82ª
\81A
\82æ
\82ë
\82µ
\82¢
\82Å
\82·
\82©(y/n)y
\r
2104 -------------------------------------------------------------------------------
\r
2105 >copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateWork.txt"
\r
2106 >copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateWork.txt"
\r
2107 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
2108 -------------------------------------------------------------------------------
\r
2109 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateWork.txt"
\r
2110 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateWork.txt"
\r
2111 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
2112 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
2113 -------------------------------------------------------------------------------
\r
2114 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateWork.txt (.
\95s
\95Ï)
\r
2115 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateWork.txt (.
\95s
\95Ï)
\r
2117 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
2118 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
2119 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2120 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2121 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
2122 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
2123 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2124 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
2125 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
2128 -------------------------------------------------------------------------------
\r
2129 %FullPath(..)%\FilesA\Project - Synced
\r
2130 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
2131 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
2132 -------------------------------------------------------------------------------
\r
2133 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
2134 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
2135 1. .!* UpdateWorkAlmostSame.txt
\r
2136 2. .=* UpdateWorkAlmostSameToSame.txt
\r
2137 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
2139 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
2140 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2141 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
2142 98.
\81\9a \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é [AutoCommit]
\r
2145 -------------------------------------------------------------------------------
\r
2146 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateWorkAlmostSame.txt"
\r
2147 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateWorkAlmostSame.txt"
\r
2148 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
2149 \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
2150 -------------------------------------------------------------------------------
\r
2151 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateWorkAlmostSame.txt (.
\95s
\95Ï)
\r
2152 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateWorkAlmostSame.txt (*
\95Ï
\8dX)
\r
2154 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
2155 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
2156 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2157 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2158 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
2159 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
2160 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2161 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
2162 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
2165 -------------------------------------------------------------------------------
\r
2166 >copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateWorkAlmostSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateWorkAlmostSame.txt"
\r
2167 >copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateWorkAlmostSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateWorkAlmostSame.txt"
\r
2168 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
2169 -------------------------------------------------------------------------------
\r
2170 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateWorkAlmostSame.txt"
\r
2171 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateWorkAlmostSame.txt"
\r
2172 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
2173 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
2174 -------------------------------------------------------------------------------
\r
2175 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateWorkAlmostSame.txt (.
\95s
\95Ï)
\r
2176 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateWorkAlmostSame.txt (.
\95s
\95Ï)
\r
2178 1. Diff
\82Å
\8aJ
\82
\81F
\93¯
\8aú
\82·
\82é
\83t
\83@
\83C
\83\8b (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
2179 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
2180 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2181 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2182 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
2183 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
2184 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2185 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
2186 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
2189 -------------------------------------------------------------------------------
\r
2190 %FullPath(..)%\FilesA\Project - Synced
\r
2191 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
2192 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
2193 -------------------------------------------------------------------------------
\r
2194 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
2195 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
2196 1. .=* UpdateWorkAlmostSameToSame.txt
\r
2197 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
2199 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
2200 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2201 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
2202 98.
\81\9a \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é [AutoCommit]
\r
2205 -------------------------------------------------------------------------------
\r
2206 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateWorkAlmostSameToSame.txt"
\r
2207 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateWorkAlmostSameToSame.txt"
\r
2208 \83x
\81[
\83X
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\83t
\83@
\83C
\83\8b\82Í
\81u
\88Ù
\82È
\82é
\93à
\97e
\81v
\82Å
\82µ
\82½
\81B
\r
2209 \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
2210 -------------------------------------------------------------------------------
\r
2211 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateWorkAlmostSameToSame.txt (.
\95s
\95Ï)
\r
2212 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateWorkAlmostSameToSame.txt (*
\95Ï
\8dX)
\r
2214 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
2215 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\93¯
\8aú
\93à
\97e (!
\88Ù
\82È
\82é) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
2216 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2217 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2218 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
2219 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
2220 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2221 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
2222 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
2226 \81\9a[WARNING]
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Å
\93à
\97e
\82ª
\88Ù
\82È
\82Á
\82Ä
\82¢
\82½
\82Ì
\82ª
\93¯
\82¶
\82É
\82È
\82è
\82Ü
\82µ
\82½
\81B
\r
2228 \8cx
\8d\90\82ª
\82 \82è
\82Ü
\82µ
\82½
\82ª
\81A
\82æ
\82ë
\82µ
\82¢
\82Å
\82·
\82©(y/n)y
\r
2229 -------------------------------------------------------------------------------
\r
2230 >copy_ren "%FullPath(..)%\FilesA\Project\Work\UpdateWorkAlmostSameToSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\UpdateWorkAlmostSameToSame.txt"
\r
2231 >copy_ren "%FullPath(..)%\FilesA\Project\Base\UpdateWorkAlmostSameToSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\UpdateWorkAlmostSameToSame.txt"
\r
2232 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
2233 -------------------------------------------------------------------------------
\r
2234 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\UpdateWorkAlmostSameToSame.txt"
\r
2235 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\UpdateWorkAlmostSameToSame.txt"
\r
2236 \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µ
\82½
\81B
\r
2237 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
2238 -------------------------------------------------------------------------------
\r
2239 \81\9a\83x
\81[
\83X
\81iBASE
\81j: UpdateWorkAlmostSameToSame.txt (.
\95s
\95Ï)
\r
2240 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: UpdateWorkAlmostSameToSame.txt (.
\95s
\95Ï)
\r
2242 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
2243 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
2244 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2245 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
2246 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
2247 55.Diff
\82Å
\8aJ
\82
\81F[
\83x
\81[
\83X /
\83\8f\81[
\83N /
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N ]
\r
2248 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2249 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
2250 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
2253 -------------------------------------------------------------------------------
\r
2254 %FullPath(..)%\FilesA\Project - Synced
\r
2255 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
2256 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
2257 -------------------------------------------------------------------------------
\r
2258 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
2259 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
2260 \82È
\82µ
\81i
\93¯
\8aú
\8a®
\97¹
\81j
\r
2261 \8d¶
\89E
\97¼
\95û
\82 \82é
\83t
\83@
\83C
\83\8b\82Ì
\90\94\81\81 21/35 (60%%)
\r
2263 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é [Rescan]
\r
2264 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
2265 93.
\8fó
\8bµ
\82ð
\95ª
\90Í
\82·
\82é [Analyze]
\r
2266 97.
\82·
\82×
\82Ä
\82Ì
\83t
\83@
\83C
\83\8b\82ð
\95\
\8e¦
\82·
\82é
\r