bookmark: informs of failure to upgrade a bookmark
When we explicitly requested to update a bookmark but the bookmark location was
missing locally, we used to silently ignore the case. We now issue a message
about it to point that something wrong is going on.
By chance, we fixed all the cases where is case happened (for explicit pulling
only, issue4700 is still open). But I think it is still valuable to have a
warning in place in case such issue is reintroduced.
This patch have been tested against issue4689 test (but without issue4689 fix).
It give the better but expected failure seen below:
> --- /home/pyd/src/mercurial-dev/tests/test-bookmarks-pushpull.t
> +++ /home/pyd/src/mercurial-dev/tests/test-bookmarks-pushpull.t.err
> @@ -337,12 +337,12 @@
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files
> - updating bookmark Y
> + remote bookmark Y point to locally missing 0d60821d2197
> (run 'hg update' to get a working copy)
> $ hg book
> * @ 1:0d2164f0ce0d
> X 1:0d2164f0ce0d
> - Y 5:35d1ef0a8d1b
> + Y 4:b0a5eff05604
> Z 1:0d2164f0ce0d
>
> Update a bookmark right after the initial lookup -r (issue4700)
> @@ -387,12 +387,11 @@
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files
> - updating bookmark Y
> (run 'hg update' to get a working copy)
> $ hg book
> * @ 1:0d2164f0ce0d
> X 1:0d2164f0ce0d
> - Y 6:0d60821d2197
> + Y 4:b0a5eff05604
> Z 1:0d2164f0ce0d
> $ hg -R $TESTTMP/pull-race book
> @ 1:0d2164f0ce0d
Initial setup.
$ hg init repo
$ cd repo
$ touch thefile
$ hg ci -A -m 'Initial commit.'
adding thefile
Create a tag.
$ hg tag branchortag
Create a branch with the same name as the tag.
$ hg branch branchortag
marked working directory as branch branchortag
(branches are permanent and global, did you want a bookmark?)
$ hg ci -m 'Create a branch with the same name as a tag.'
This is what we have:
$ hg log
changeset: 2:10519b3f489a
branch: branchortag
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Create a branch with the same name as a tag.
changeset: 1:2635c45ca99b
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Added tag branchortag for changeset f57387372b5d
changeset: 0:f57387372b5d
tag: branchortag
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Initial commit.
Update to the tag:
$ hg up 'tag(branchortag)'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg parents
changeset: 0:f57387372b5d
tag: branchortag
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Initial commit.
Updating to the branch:
$ hg up 'branch(branchortag)'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg parents
changeset: 2:10519b3f489a
branch: branchortag
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Create a branch with the same name as a tag.
$ cd ..