Mercurial > hg
comparison tests/test-resolve.t @ 39928:f07ab9ddc0c0
resolve: rename {status} to {mergestatus} to not shadow change status (BC)
This is a part of the name unification. I think it's somewhat useful to
provide a combined view of change/merge statuses.
https://www.mercurial-scm.org/wiki/GenericTemplatingPlan#Dictionary
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 30 Sep 2018 15:15:27 +0900 |
parents | 213c0493cea0 |
children | da2e874fe582 8785d66edd6e |
comparison
equal
deleted
inserted
replaced
39927:59592ac26f85 | 39928:f07ab9ddc0c0 |
---|---|
154 U file2 | 154 U file2 |
155 | 155 |
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 |
174 $ hg resolve -m | 174 $ hg resolve -m |
175 (no more unresolved files) | 175 (no more unresolved files) |