Mercurial > hg
view tests/test-bookmarks-strip.out @ 10672:c2e1e637d4da stable
rebase: always check if rebasing onto an applied mq patch.
Previously, it only checked for an mq patch if the user explicitly
passed -d/--dest. But rebasing onto an mq patch is a bad idea
regardless of how we determine the rebase destination.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Tue, 02 Mar 2010 15:08:43 -0500 |
parents | 9737041646bc |
children | 4bb4895e1693 |
line wrap: on
line source
% add file adding qqq.txt % commit first revision % set bookmark % commit second revision % set bookmark % update to -2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % commit new head created new head % bookmarks updated? test 1:16b24da7e457 test2 1:16b24da7e457 % strip to revision 1 saving bundle to saving bundle to adding branch adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files % list bookmarks * test 1:9f1b7e78eff8 * test2 1:9f1b7e78eff8