##// END OF EJS Templates
resolve: rename {status} to {mergestatus} to not shadow change status (BC)...
Yuya Nishihara -
r39964:f07ab9dd default
parent child Browse files
Show More
@@ -4622,7 +4622,7 b' def resolve(ui, repo, *pats, **opts):'
4622 label, key = mergestateinfo[ms[f]]
4622 label, key = mergestateinfo[ms[f]]
4623 fm.startitem()
4623 fm.startitem()
4624 fm.context(ctx=wctx)
4624 fm.context(ctx=wctx)
4625 fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
4625 fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label)
4626 fm.write('path', '%s\n', f, label=label)
4626 fm.write('path', '%s\n', f, label=label)
4627 fm.end()
4627 fm.end()
4628 return 0
4628 return 0
@@ -156,18 +156,18 b' resolve -l should show resolved file as '
156 $ hg resolve -l -Tjson
156 $ hg resolve -l -Tjson
157 [
157 [
158 {
158 {
159 "path": "file1",
159 "mergestatus": "R",
160 "status": "R"
160 "path": "file1"
161 },
161 },
162 {
162 {
163 "path": "file2",
163 "mergestatus": "U",
164 "status": "U"
164 "path": "file2"
165 }
165 }
166 ]
166 ]
167
167
168 $ hg resolve -l -T '{path} {status} {p1rev} {p2rev}\n'
168 $ hg resolve -l -T '{path} {mergestatus} {status} {p1rev} {p2rev}\n'
169 file1 R 2 1
169 file1 R M 2 1
170 file2 U 2 1
170 file2 U M 2 1
171
171
172 resolve -m without paths should mark all resolved
172 resolve -m without paths should mark all resolved
173
173
General Comments 0
You need to be logged in to leave comments. Login now