equal
deleted
inserted
replaced
182 updated to "bd10386d478c: 2" |
182 updated to "bd10386d478c: 2" |
183 1 other heads for branch "default" |
183 1 other heads for branch "default" |
184 parent=2 |
184 parent=2 |
185 |
185 |
186 $ revtest '-cC dirty linear' dirty 1 2 -cC |
186 $ revtest '-cC dirty linear' dirty 1 2 -cC |
187 abort: can only specify one of -C/--clean, -c/--check, or -m/merge |
187 abort: can only specify one of -C/--clean, -c/--check, or -m/--merge |
188 parent=1 |
188 parent=1 |
189 M foo |
189 M foo |
190 |
190 |
191 $ revtest '-mc dirty linear' dirty 1 2 -mc |
191 $ revtest '-mc dirty linear' dirty 1 2 -mc |
192 abort: can only specify one of -C/--clean, -c/--check, or -m/merge |
192 abort: can only specify one of -C/--clean, -c/--check, or -m/--merge |
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: can only specify one of -C/--clean, -c/--check, or -m/--merge |
198 parent=1 |
198 parent=1 |
199 M foo |
199 M foo |
200 |
200 |
201 $ echo '[commands]' >> .hg/hgrc |
201 $ echo '[commands]' >> .hg/hgrc |
202 $ echo 'update.check = abort' >> .hg/hgrc |
202 $ echo 'update.check = abort' >> .hg/hgrc |