Mercurial > hg
view tests/test-issue1306.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 | a3d73b3e1f8a |
children |
line wrap: on
line source
% initialize remote repo with branches adding a marked working directory as branch br adding c changeset: 2:1630aed6ed2b branch: br tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: c changeset: 1:234f53e6c5ff branch: br user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: b changeset: 0:cb9a9f314b8b user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: a % try cloning -r branch requesting all changes adding changesets adding manifests adding file changes added 3 changesets with 2 changes to 2 files updating to branch br 2 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 2:1630aed6ed2b branch: br tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: c % try cloning -rother clone#branch requesting all changes adding changesets adding manifests adding file changes added 3 changesets with 2 changes to 2 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 0:cb9a9f314b8b user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: a % try cloning -r1 clone#branch requesting all changes adding changesets adding manifests adding file changes added 3 changesets with 2 changes to 2 files updating to branch br 1 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 1:234f53e6c5ff branch: br user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: b