Fix conflicts and remove extra tests

Author: gaogaotiantian

Lib/bdb.py

@@ -339,12 +339,8 @@ def set_trace(self, frame=None):
             frame.f_trace = self.trace_dispatch
             self.botframe = frame
             frame = frame.f_back
-<<<<<<< HEAD
         self.set_step()
-=======
-        self.set_stepinstr()
         self.enterframe = None
->>>>>>> 767c89ba7c5... gh-58956: Fix a frame refleak in bdb (#128190)
         sys.settrace(self.trace_dispatch)
 
     def set_continue(self):
@@ -361,13 +357,7 @@ def set_continue(self):
             while frame and frame is not self.botframe:
                 del frame.f_trace
                 frame = frame.f_back
-<<<<<<< HEAD
-=======
-            for frame, (trace_lines, trace_opcodes) in self.frame_trace_lines_opcodes.items():
-                frame.f_trace_lines, frame.f_trace_opcodes = trace_lines, trace_opcodes
-            self.frame_trace_lines_opcodes = {}
             self.enterframe = None
->>>>>>> 767c89ba7c5... gh-58956: Fix a frame refleak in bdb (#128190)
 
     def set_quit(self):
         """Set quitting attribute to True.

Lib/test/test_pdb.py

@@ -1981,30 +1981,6 @@ def test_pdb_ambiguous_statements():
     (Pdb) continue
     """
 
-def test_pdb_f_trace_lines():
-    """GH-80675
-
-    pdb should work even if f_trace_lines is set to False on some frames.
-
-    >>> reset_Breakpoint()
-
-    >>> def test_function():
-    ...     import sys
-    ...     frame = sys._getframe()
-    ...     frame.f_trace_lines = False
-    ...     import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
-    ...     if frame.f_trace_lines != False:
-    ...         print("f_trace_lines is not reset after continue!")
-
-    >>> with PdbTestInput([  # doctest: +NORMALIZE_WHITESPACE
-    ...     'continue'
-    ... ]):
-    ...    test_function()
-    > <doctest test.test_pdb.test_pdb_f_trace_lines[1]>(5)test_function()
-    -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
-    (Pdb) continue
-    """
-
 def test_pdb_frame_refleak():
     """
     pdb should not leak reference to frames
@@ -2056,47 +2032,6 @@ def test_pdb_frame_refleak():
     1
     """
 
-def test_pdb_function_break():
-    """Testing the line number of break on function
-
-    >>> def foo(): pass
-
-    >>> def bar():
-    ...
-    ...     pass
-
-    >>> def boo():
-    ...     # comments
-    ...     global x
-    ...     x = 1
-
-    >>> def gen():
-    ...     yield 42
-
-    >>> def test_function():
-    ...     import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
-
-    >>> with PdbTestInput([  # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
-    ...     'break foo',
-    ...     'break bar',
-    ...     'break boo',
-    ...     'break gen',
-    ...     'continue'
-    ... ]):
-    ...     test_function()
-    > <doctest test.test_pdb.test_pdb_function_break[4]>(2)test_function()
-    -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
-    (Pdb) break foo
-    Breakpoint ... at <doctest test.test_pdb.test_pdb_function_break[0]>:1
-    (Pdb) break bar
-    Breakpoint ... at <doctest test.test_pdb.test_pdb_function_break[1]>:3
-    (Pdb) break boo
-    Breakpoint ... at <doctest test.test_pdb.test_pdb_function_break[2]>:4
-    (Pdb) break gen
-    Breakpoint ... at <doctest test.test_pdb.test_pdb_function_break[3]>:2
-    (Pdb) continue
-    """
-
 def test_pdb_issue_gh_65052():
     """See GH-65052