Show More
@@ -88,26 +88,32 b' class TestCommitsInNonEmptyRepo(BackendT' | |||
|
88 | 88 | @pytest.mark.backends("git", "hg") |
|
89 | 89 | def test_new_head_in_default_branch(self): |
|
90 | 90 | tip = self.repo.get_commit() |
|
91 | self.imc.add(FileNode(b'docs/index.txt', content=b'Documentation\n')) | |
|
91 | ||
|
92 | self.imc.add( | |
|
93 | FileNode(b"docs/index.txt", content=b"Documentation\n") | |
|
94 | ) | |
|
92 | 95 | foobar_tip = self.imc.commit( |
|
93 |
message= |
|
|
94 |
author= |
|
|
95 |
branch= |
|
|
96 | message="New branch: foobar", | |
|
97 | author="joe <joe@rhodecode.com>", | |
|
98 | branch="foobar", | |
|
96 | 99 | parents=[tip], |
|
97 | 100 | ) |
|
98 | self.imc.change(FileNode(b'docs/index.txt', content=b'Documentation\nand more...\n')) | |
|
101 | self.imc.change( | |
|
102 | FileNode(b"docs/index.txt", content=b"Documentation\nand more...\n") | |
|
103 | ) | |
|
104 | assert foobar_tip.branch == "foobar" | |
|
99 | 105 | newtip = self.imc.commit( |
|
100 |
message= |
|
|
101 |
author= |
|
|
106 | message="At foobar_tip branch", | |
|
107 | author="joe <joe@rhodecode.com>", | |
|
102 | 108 | branch=foobar_tip.branch, |
|
103 | 109 | parents=[foobar_tip], |
|
104 | 110 | ) |
|
105 | 111 | |
|
106 | 112 | newest_tip = self.imc.commit( |
|
107 |
message= |
|
|
108 |
author= |
|
|
113 | message=f"Merged with {foobar_tip.raw_id}", | |
|
114 | author="joe <joe@rhodecode.com>", | |
|
109 | 115 | branch=self.backend_class.DEFAULT_BRANCH_NAME, |
|
110 |
parents=[ |
|
|
116 | parents=[tip, newtip], | |
|
111 | 117 | ) |
|
112 | 118 | |
|
113 | 119 | assert newest_tip.branch == self.backend_class.DEFAULT_BRANCH_NAME |
General Comments 0
You need to be logged in to leave comments.
Login now