diff options
Diffstat (limited to 'Tools/Scripts/webkitpy/common/checkout/scm_unittest.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/common/checkout/scm_unittest.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Tools/Scripts/webkitpy/common/checkout/scm_unittest.py b/Tools/Scripts/webkitpy/common/checkout/scm_unittest.py index decfae0..79b354d 100644 --- a/Tools/Scripts/webkitpy/common/checkout/scm_unittest.py +++ b/Tools/Scripts/webkitpy/common/checkout/scm_unittest.py @@ -1138,6 +1138,16 @@ class GitSVNTest(SCMTest): self.assertTrue(re.search(r'test_file_commit1', patch)) self.assertTrue(re.search(r'Subversion Revision: 5', patch)) + def test_create_patch_after_merge(self): + run_command(['git', 'checkout', '-b', 'dummy-branch', 'trunk~3']) + self._one_local_commit() + run_command(['git', 'merge', 'trunk']) + + scm = detect_scm_system(self.git_checkout_path) + patch = scm.create_patch() + self.assertTrue(re.search(r'test_file_commit1', patch)) + self.assertTrue(re.search(r'Subversion Revision: 5', patch)) + def test_create_patch_with_changed_files(self): self._one_local_commit_plus_working_copy_changes() scm = detect_scm_system(self.git_checkout_path) |