equal
deleted
inserted
replaced
189 note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it |
189 note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it |
190 transaction abort! |
190 transaction abort! |
191 rollback completed |
191 rollback completed |
192 qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
192 qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
193 abort: pretxncommit.unexpectedabort hook exited with status 1 |
193 abort: pretxncommit.unexpectedabort hook exited with status 1 |
194 [255] |
194 [40] |
195 $ cat .hg/last-message.txt |
195 $ cat .hg/last-message.txt |
196 Fifth commit message |
196 Fifth commit message |
197 This is the 5th log message |
197 This is the 5th log message |
198 |
198 |
199 |
199 |
233 note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it |
233 note: use 'hg commit --logfile .hg/last-message.txt --edit' to reuse it |
234 transaction abort! |
234 transaction abort! |
235 rollback completed |
235 rollback completed |
236 qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
236 qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
237 abort: pretxncommit.unexpectedabort hook exited with status 1 |
237 abort: pretxncommit.unexpectedabort hook exited with status 1 |
238 [255] |
238 [40] |
239 |
239 |
240 (rebuilding at failure of qrefresh bases on rev #0, and it causes |
240 (rebuilding at failure of qrefresh bases on rev #0, and it causes |
241 dropping status of "file2") |
241 dropping status of "file2") |
242 |
242 |
243 $ sh "$TESTTMP/checkvisibility.sh" |
243 $ sh "$TESTTMP/checkvisibility.sh" |
271 ==== |
271 ==== |
272 transaction abort! |
272 transaction abort! |
273 rollback completed |
273 rollback completed |
274 qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
274 qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
275 abort: pretxncommit.unexpectedabort hook exited with status 1 |
275 abort: pretxncommit.unexpectedabort hook exited with status 1 |
276 [255] |
276 [40] |
277 |
277 |
278 $ sh "$TESTTMP/checkvisibility.sh" |
278 $ sh "$TESTTMP/checkvisibility.sh" |
279 ==== |
279 ==== |
280 0:25e397dabed2 |
280 0:25e397dabed2 |
281 ==== |
281 ==== |
313 ==== |
313 ==== |
314 transaction abort! |
314 transaction abort! |
315 rollback completed |
315 rollback completed |
316 qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
316 qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
317 abort: pretxncommit.unexpectedabort hook exited with status 1 |
317 abort: pretxncommit.unexpectedabort hook exited with status 1 |
318 [255] |
318 [40] |
319 |
319 |
320 $ sh "$TESTTMP/checkvisibility.sh" |
320 $ sh "$TESTTMP/checkvisibility.sh" |
321 ==== |
321 ==== |
322 0:25e397dabed2 |
322 0:25e397dabed2 |
323 ==== |
323 ==== |