tests/test-mq-safety.out
changeset 10362 2e3ec7ef5349
parent 7621 6d891df43a5f
child 11173 5b48d819d5f9
equal deleted inserted replaced
10361:49cd2e7fd91c 10362:2e3ec7ef5349
    10 abort: popping would remove a revision not managed by this patch queue
    10 abort: popping would remove a revision not managed by this patch queue
    11 % qrefresh
    11 % qrefresh
    12 abort: cannot refresh a revision with children
    12 abort: cannot refresh a revision with children
    13 % tip:
    13 % tip:
    14 3 append quux
    14 3 append quux
       
    15 % qpush warning branchheads
       
    16 popping qp
       
    17 patch queue now empty
       
    18 adding a
       
    19 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
    20 marked working directory as branch b
       
    21 adding c
       
    22 created new head
       
    23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    24 (branch merge, don't forget to commit)
       
    25 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
    26 changeset:   2:65309210bf4e
       
    27 branch:      b
       
    28 tag:         tip
       
    29 parent:      1:707adb4c8ae1
       
    30 parent:      0:cb9a9f314b8b
       
    31 user:        test
       
    32 date:        Thu Jan 01 00:00:00 1970 +0000
       
    33 summary:     merge
       
    34 
       
    35 changeset:   1:707adb4c8ae1
       
    36 branch:      b
       
    37 parent:      -1:000000000000
       
    38 user:        test
       
    39 date:        Thu Jan 01 00:00:00 1970 +0000
       
    40 summary:     c
       
    41 
       
    42 changeset:   0:cb9a9f314b8b
       
    43 user:        test
       
    44 date:        Thu Jan 01 00:00:00 1970 +0000
       
    45 summary:     a
       
    46 
       
    47 applying qp
       
    48 now at: qp