equal
deleted
inserted
replaced
187 updated to "bd10386d478c: 2" |
187 updated to "bd10386d478c: 2" |
188 1 other heads for branch "default" |
188 1 other heads for branch "default" |
189 parent=2 |
189 parent=2 |
190 |
190 |
191 $ revtest '-cC dirty linear' dirty 1 2 -cC |
191 $ revtest '-cC dirty linear' dirty 1 2 -cC |
192 abort: can only specify one of -C/--clean, -c/--check, or -m/--merge |
192 abort: cannot specify both --clean and --check |
193 parent=1 |
193 parent=1 |
194 M foo |
194 M foo |
195 |
195 |
196 $ revtest '-mc dirty linear' dirty 1 2 -mc |
196 $ revtest '-mc dirty linear' dirty 1 2 -mc |
197 abort: can only specify one of -C/--clean, -c/--check, or -m/--merge |
197 abort: cannot specify both --check and --merge |
198 parent=1 |
198 parent=1 |
199 M foo |
199 M foo |
200 |
200 |
201 $ revtest '-mC dirty linear' dirty 1 2 -mC |
201 $ revtest '-mC dirty linear' dirty 1 2 -mC |
202 abort: can only specify one of -C/--clean, -c/--check, or -m/--merge |
202 abort: cannot specify both --clean and --merge |
203 parent=1 |
203 parent=1 |
204 M foo |
204 M foo |
205 |
205 |
206 $ echo '[commands]' >> .hg/hgrc |
206 $ echo '[commands]' >> .hg/hgrc |
207 $ echo 'update.check = abort' >> .hg/hgrc |
207 $ echo 'update.check = abort' >> .hg/hgrc |