Mercurial > hg
view tests/test-rebase-keep-branch.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 | 609ce91670d0 |
children | 5b48d819d5f9 |
line wrap: on
line source
0 files updated, 0 files merged, 2 files removed, 0 files unresolved marked working directory as branch notdefault created new head @ 4:r1:notdefault | | o 3:l2: | | | o 2:l1: |/ o 1:c2: | o 0:c1: % Rebase a branch while preserving the branch name 2 files updated, 0 files merged, 1 files removed, 0 files unresolved saving bundle to adding branch adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files rebase completed @ 4:r1:notdefault | o 3:l2: | o 2:l1: | o 1:c2: | o 0:c1: % dirstate branch should be "notdefault" notdefault