Mercurial > hg

comparison tests/test-mq.out @ 7621:6d891df43a5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mq: allow qpop if popped revisions are not working dir parents
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 12 Jan 2009 09:07:02 +0100
parents 26adfaccdf73
children fb32ae9c76e7
comparison
equal deleted inserted replaced
7620:fbfd92d51540 7621:6d891df43a5f
292 date: Thu Jan 01 00:00:00 1970 +0000 292 date: Thu Jan 01 00:00:00 1970 +0000
293 summary: a 293 summary: a
294 294
295 mq status file refers to unknown node 295 mq status file refers to unknown node
296 default 0:cb9a9f314b8b 296 default 0:cb9a9f314b8b
297 abort: working directory revision is not qtip 297 abort: trying to pop unknown node
298 new file 298 new file
299 299
300 diff --git a/new b/new 300 diff --git a/new b/new
301 new file mode 100755 301 new file mode 100755
302 --- /dev/null 302 --- /dev/null
536 +++ b/hello.txt 536 +++ b/hello.txt
537 @@ -1,1 +1,3 @@ 537 @@ -1,1 +1,3 @@
538 hello 538 hello
539 +world 539 +world
540 +universe 540 +universe
541 % test popping revisions not in working dir ancestry
542 0 A empty
543 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
544 Patch queue now empty