Mercurial > hg
view tests/test-mq-safety.out @ 6298:53cbb33e1269
normallookup: during merges, restore the state saved by remove
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
parents | dcda0c90125c |
children | 6d891df43a5f |
line wrap: on
line source
% try to commit on top of a patch abort: cannot commit over an applied mq patch % qpop/qrefresh on the wrong revision abort: working directory revision is not qtip using patch queue: abort: popping would remove a revision not managed by this patch queue abort: working directory revision is not qtip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % qpop abort: popping would remove a revision not managed by this patch queue % qrefresh abort: cannot refresh a revision with children % tip: 3 append quux