Mercurial > hg-stable
view tests/test-bookmarks-current.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 | cb516e788238 |
children | 717c35d55fb3 |
line wrap: on
line source
% no bookmarks no bookmarks set % set bookmark X % list bookmarks * X -1:000000000000 % update to bookmark X 0 files updated, 0 files merged, 0 files removed, 0 files unresolved % list bookmarks * X -1:000000000000 % rename % list bookmarks * Z -1:000000000000 % new bookmark Y % list bookmarks * Y -1:000000000000 Z -1:000000000000 % commit % list bookmarks * Y 0:719295282060 Z -1:000000000000 % delete bookmarks % list bookmarks no bookmarks set % update to tip 0 files updated, 0 files merged, 0 files removed, 0 files unresolved