1 >SetVar "Setting_getDiffCmdLine", "ArgsLog"
\r
2 %FullPath(..)%\FilesA\Project - Synced\SyncFilesX_Setting.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. - DeleteBaseFromOnly.txt
\r
12 2. - - DeleteBoth.txt
\r
13 3. - DeleteWorkFromOnly.txt
\r
14 4. +!+ NewNotSame.txt
\r
16 6. .=. NoUpdate_Same.txt
\r
17 7. .!. NoUpdateAlmostSame.txt
\r
18 8. - SubForWork\DeleteBaseFromOnly.txt
\r
19 9. - - SubForWork\DeleteBoth.txt
\r
20 10. .=. SubForWork\NoUpdate_Same.txt
\r
21 11. .!. SubForWork\NoUpdateAlmostSame.txt
\r
22 12. *!. SubForWork\UpdateBase.txt
\r
23 13. *=* SubForWork\UpdateBothSame_ForWork.txt
\r
24 14. .!* SubForWork\UpdateWork.txt
\r
25 15. - SubForWork\DeleteWorkFromOnly.txt
\r
26 16. *!. UpdateBase.txt
\r
27 17. *!* UpdateBoth.txt
\r
28 18. .!* UpdateWork.txt
\r
30 -------------------------------------------------------------------------------
\r
31 %FullPath(..)%\FilesA\Project - Synced
\r
32 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
33 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
34 *:
\93¯
\8aú
\82³
\82ê
\82Ä
\82¢
\82È
\82¢
\83t
\83@
\83C
\83\8b\81A=:
\96¢
\93¯
\8aú
\82Å
\83y
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Ì
\93à
\97e
\82ª
\93¯
\82¶
\r
35 -------------------------------------------------------------------------------
\r
36 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
37 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
38 1. - DeleteBaseFromOnly.txt
\r
39 2. - - DeleteBoth.txt
\r
40 3. - DeleteWorkFromOnly.txt
\r
41 4. +!+ NewNotSame.txt
\r
43 6. - SubForWork\DeleteBaseFromOnly.txt
\r
44 7. - - SubForWork\DeleteBoth.txt
\r
45 8. - SubForWork\DeleteWorkFromOnly.txt
\r
46 9. *!. SubForWork\UpdateBase.txt
\r
47 10. *=* SubForWork\UpdateBothSame_ForWork.txt
\r
48 11. .!* SubForWork\UpdateWork.txt
\r
49 12. *!. UpdateBase.txt
\r
50 13. *!* UpdateBoth.txt
\r
51 14. .!* UpdateWork.txt
\r
53 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
54 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
55 98.
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82ª
\93¯
\82¶
\83t
\83@
\83C
\83\8b\82ð
\82·
\82×
\82Ä
\83R
\83~
\83b
\83g
\82·
\82é
\r
58 -------------------------------------------------------------------------------
\r
59 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForBase.txt"
\r
60 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForWork.txt"
\r
61 \83x
\81[
\83X
\81E
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\81E
\83t
\83@
\83C
\83\8b\82Í
\81u
\93¯
\82¶
\93à
\97e
\81v
\82Å
\82·
\r
62 \8eè
\93®
\82Å
\93¯
\8aú
\82µ
\82½
\82ç
\81A
\83R
\83~
\83b
\83g
\82µ
\82Ä
\82
\82¾
\82³
\82¢
\81B
\r
63 -------------------------------------------------------------------------------
\r
64 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\UpdateBothSame_ForBase.txt (*
\95Ï
\8dX)
\r
65 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\UpdateBothSame_ForWork.txt (*
\95Ï
\8dX)
\r
67 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
68 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\82Ì
\93¯
\8aú (=
\93¯
\82¶) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
69 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
70 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (*
\95Ï
\8dX) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
71 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
72 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
73 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
74 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
75 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
78 -------------------------------------------------------------------------------
\r
79 >copy_ren "%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForWork.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\UpdateBothSame_ForWork.txt"
\r
80 >copy_ren "%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForBase.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\UpdateBothSame_ForBase.txt"
\r
81 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
82 -------------------------------------------------------------------------------
\r
83 \83x
\81[
\83X
\81F"%FullPath(..)%\FilesA\Project\Base\SubForBase\UpdateBothSame_ForBase.txt"
\r
84 \83\8f\81[
\83N
\81F"%FullPath(..)%\FilesA\Project\Work\SubForWork\UpdateBothSame_ForWork.txt"
\r
85 \83x
\81[
\83X
\81E
\83t
\83@
\83C
\83\8b\82Æ
\83\8f\81[
\83N
\81E
\83t
\83@
\83C
\83\8b\82Í
\81u
\93¯
\82¶
\93à
\97e
\81v
\82Å
\82·
\r
86 \83R
\83~
\83b
\83g
\82µ
\82Ü
\82µ
\82½
\81B
\r
87 -------------------------------------------------------------------------------
\r
88 \81\9a\83x
\81[
\83X
\81iBASE
\81j: SubForBase\UpdateBothSame_ForBase.txt (.
\95s
\95Ï)
\r
89 \81\9a\83\8f\81[
\83N
\81iWORK
\81j: SubForWork\UpdateBothSame_ForWork.txt (.
\95s
\95Ï)
\r
91 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
92 2. Diff
\82Å
\8aJ
\82
\81F
\91O
\89ñ
\82Ì
\93¯
\8aú (=
\93¯
\82¶) [
\83x
\81[
\83X /
\83\8f\81[
\83N ]
\r
93 4. Diff
\82Å
\8aJ
\82
\81F
\83x
\81[
\83X (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
94 5. Diff
\82Å
\8aJ
\82
\81F
\83\8f\81[
\83N (.
\95s
\95Ï) [
\91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e /
\8c»
\8dÝ ]
\r
95 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
96 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
97 6.
\83t
\83@
\83C
\83\8b\82Ü
\82½
\82Í
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
98 Enter
\82Ì
\82Ý:
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
99 8.
\93¯
\8aú
\82ð
\83R
\83~
\83b
\83g
\82·
\82é
\r
102 -------------------------------------------------------------------------------
\r
103 %FullPath(..)%\FilesA\Project - Synced
\r
104 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
105 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
106 *:
\93¯
\8aú
\82³
\82ê
\82Ä
\82¢
\82È
\82¢
\83t
\83@
\83C
\83\8b\81A=:
\96¢
\93¯
\8aú
\82Å
\83y
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Ì
\93à
\97e
\82ª
\93¯
\82¶
\r
107 -------------------------------------------------------------------------------
\r
108 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
109 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
110 1. - DeleteBaseFromOnly.txt
\r
111 2. - - DeleteBoth.txt
\r
112 3. - DeleteWorkFromOnly.txt
\r
113 4. +!+ NewNotSame.txt
\r
115 6. - SubForWork\DeleteBaseFromOnly.txt
\r
116 7. - - SubForWork\DeleteBoth.txt
\r
117 8. - SubForWork\DeleteWorkFromOnly.txt
\r
118 9. *!. SubForWork\UpdateBase.txt
\r
119 10. .!* SubForWork\UpdateWork.txt
\r
120 11. *!. UpdateBase.txt
\r
121 12. *!* UpdateBoth.txt
\r
122 13. .!* UpdateWork.txt
\r
124 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
125 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r
126 98.
\83x
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82ª
\93¯
\82¶
\83t
\83@
\83C
\83\8b\82ð
\82·
\82×
\82Ä
\83R
\83~
\83b
\83g
\82·
\82é
\r
130 - DeleteBaseFromOnly.txt
\r
132 - DeleteWorkFromOnly.txt
\r
134 - SubForWork\DeleteBaseFromOnly.txt
\r
135 - - SubForWork\DeleteBoth.txt
\r
136 - SubForWork\DeleteWorkFromOnly.txt
\r
137 \88È
\8fã
\82Ì
\83t
\83@
\83C
\83\8b\82ð
\82·
\82×
\82Ä
\83R
\83~
\83b
\83g
\82µ
\82Ü
\82·
\82©(y/n)y
\r
138 -------------------------------------------------------------------------------
\r
139 >del "%FullPath(..)%\FilesA\Project - Synced\Work\DeleteBaseFromOnly.txt"
\r
140 >del "%FullPath(..)%\FilesA\Project - Synced\Base\DeleteBaseFromOnly.txt"
\r
141 >del "%FullPath(..)%\FilesA\Project - Synced\Work\DeleteBoth.txt"
\r
142 >del "%FullPath(..)%\FilesA\Project - Synced\Base\DeleteBoth.txt"
\r
143 >del "%FullPath(..)%\FilesA\Project - Synced\Work\DeleteWorkFromOnly.txt"
\r
144 >del "%FullPath(..)%\FilesA\Project - Synced\Base\DeleteWorkFromOnly.txt"
\r
145 >copy_ren "%FullPath(..)%\FilesA\Project\Work\NewSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Work\NewSame.txt"
\r
146 >copy_ren "%FullPath(..)%\FilesA\Project\Base\NewSame.txt", "%FullPath(..)%\FilesA\Project - Synced\Base\NewSame.txt"
\r
147 >del "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\DeleteBaseFromOnly.txt"
\r
148 >del "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\DeleteBaseFromOnly.txt"
\r
149 >del "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\DeleteBoth.txt"
\r
150 >del "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\DeleteBoth.txt"
\r
151 >del "%FullPath(..)%\FilesA\Project - Synced\Work\SubForWork\DeleteWorkFromOnly.txt"
\r
152 >del "%FullPath(..)%\FilesA\Project - Synced\Base\SubForBase\DeleteWorkFromOnly.txt"
\r
153 -------------------------------------------------------------------------------
\r
154 %FullPath(..)%\FilesA\Project - Synced
\r
155 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83x
\81[
\83X: "Base"
\r
156 \91O
\89ñ
\83R
\83~
\83b
\83g
\8e\9e\82Ì
\83\8f\81[
\83N: "Work"
\r
157 *:
\93¯
\8aú
\82³
\82ê
\82Ä
\82¢
\82È
\82¢
\83t
\83@
\83C
\83\8b\81A=:
\96¢
\93¯
\8aú
\82Å
\83y
\81[
\83X
\82Æ
\83\8f\81[
\83N
\82Ì
\93à
\97e
\82ª
\93¯
\82¶
\r
158 -------------------------------------------------------------------------------
\r
159 \81¡
\83x
\81[
\83X
\81iBASE
\81j: "..\Project\Base"
\r
160 \81¡
\83\8f\81[
\83N
\81iWORK
\81j: "..\Project\Work"
\r
161 1. +!+ NewNotSame.txt
\r
162 2. *!. SubForWork\UpdateBase.txt
\r
163 3. .!* SubForWork\UpdateWork.txt
\r
164 4. *!. UpdateBase.txt
\r
165 5. *!* UpdateBoth.txt
\r
166 6. .!* UpdateWork.txt
\r
168 91.
\8dÄ
\83X
\83L
\83\83\83\93\82·
\82é
\r
169 92.
\83\8b\81[
\83g
\81E
\83t
\83H
\83\8b\83_
\81[
\82ð
\8aJ
\82
\r