Mercurial > hg
view tests/test-rebase-rename.out @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | b969611064ae |
children | 4bb4895e1693 |
line wrap: on
line source
adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Rename is tracked 2:rename A diff --git a/a b/a-renamed rename from a rename to a-renamed % Rebase the revision containing the rename saving bundle to % Rename is not lost 2:rename A diff --git a/a b/a-renamed rename from a rename to a-renamed adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Copy is tracked 2:copy A diff --git a/a b/a-copied copy from a copy to a-copied % Rebase the revision containing the copy saving bundle to % Copy is not lost 2:copy A diff --git a/a b/a-copied copy from a copy to a-copied