Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
hg-git
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
hg-git
Commits
bb60f88c
Commit
bb60f88c
authored
4 years ago
by
Dan Villiom Podlaski Christiansen
Browse files
Options
Downloads
Patches
Plain Diff
test-bookmark-workflow: add test for pulling deleted, but changed, branch
parent
f4057353
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test-bookmark-workflow.t
+45
-0
45 additions, 0 deletions
tests/test-bookmark-workflow.t
with
45 additions
and
0 deletions
tests/test-bookmark-workflow.t
+
45
−
0
View file @
bb60f88c
...
...
@@ -219,4 +219,8 @@
comparing with $TESTTMP/gitremoterepo
searching for changed bookmarks
b2 ff7a2f2d8d70
$ hg pull
pulling from $TESTTMP/gitremoterepo
importing git objects into hg
(run
'
hg
update
'
to get a working copy)
$ cd ..
...
...
@@ -222,1 +226,42 @@
$ cd ..
Delete a branch, but with the bookmark elsewhere, it remains
$ cd gitremoterepo
$ git branch -d b1
Deleted branch b1 (was 9497a4e).
$ cd ../hggitlocalrepo
$ hg book -fr b2 b1
$ hg pull
pulling from $TESTTMP/gitremoterepo
no changes found
$ hggitstate
4 0ac7ec7b4113 fcfd2c0262db "add epsilon" bookmarks: [b4]
3 03769a650ded 55b133e1d558 "add delta" bookmarks: [b3 master]
2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: []
1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: []
0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: [b1 b2]
$ cd ..
But with the bookmark unmoved, it disappears!
$ cd gitremoterepo
$ git branch b1 9497a4e
$ cd ../hggitlocalrepo
$ hg pull
pulling from $TESTTMP/gitremoterepo
no changes found
$ cd ../gitremoterepo
$ git branch -d b1
Deleted branch b1 (was 9497a4e).
$ cd ../hggitlocalrepo
$ hg pull
pulling from $TESTTMP/gitremoterepo
no changes found
$ hggitstate
4 0ac7ec7b4113 fcfd2c0262db "add epsilon" bookmarks: [b4]
3 03769a650ded 55b133e1d558 "add delta" bookmarks: [b3 master]
2 ca33a262eb46 d338971a96e2 "add gamma" bookmarks: []
1 7fe02317c63d 9497a4ee62e1 "add beta" bookmarks: [b1]
0 ff7a2f2d8d70 7eeab2ea75ec "add alpha" bookmarks: [b2]
$ cd ..
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment