Mercurial > hg
view tests/test-mq-safety.out @ 10185:7637fe4f525d stable
mq: preserve --git flag when merging patches
Without this, merging a patch queue without diff.git=1 downgrades all git
patches to regular patches, losing data in the process.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 01 Jan 2010 19:53:05 +0100 |
parents | 6d891df43a5f |
children | 2e3ec7ef5349 |
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: popping would remove a revision not managed by this patch queue 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