view tests/test-convert-hg-sink.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.

changeset:   3:593cbf6fb2b4
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     Added tag some-tag for changeset ad681a868e44

changeset:   2:ad681a868e44
tag:         some-tag
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo/file

changeset:   1:cbba8ecc03b7
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     remove foo

changeset:   0:327daa9251fa
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     add foo and bar

initializing destination new repository
scanning source...
sorting...
converting...
3 add foo and bar
2 remove foo
1 add foo/file
0 Added tag some-tag for changeset ad681a868e44
comparing with ../orig
searching for changes
no changes found
% dirstate should be empty:
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
% put something in the dirstate:
a   0         -1 unset               baz
copy: bar -> baz
% add a new revision in the original repo
scanning source...
sorting...
converting...
0 add baz
comparing with ../orig
searching for changes
no changes found
% dirstate should be the same (no output below):
% no copies
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
baz not renamed
% test tag rewriting
initializing destination new-filemap repository
scanning source...
sorting...
converting...
4 add foo and bar
3 remove foo
2 add foo/file
1 Added tag some-tag for changeset ad681a868e44
0 add baz
tip                                2:6f4fd1df87fb
some-tag                           0:ba8636729451