Mercurial > hg

diff mercurial/merge.py @ 51700:7f0cb9ee0534

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backout accidental publication of a large range of revisions I accidentally published 25e7f9dcad0f::bd1483fd7088, this is the inverse.
author Raphaël Gomès <rgomes@octobus.net>
date Tue, 23 Jul 2024 10:02:46 +0200
parents 493034cc3265
children ca7bde5dbafb
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Jul 22 16:49:38 2024 +0200
+++ b/mercurial/merge.py	Tue Jul 23 10:02:46 2024 +0200
@@ -420,11 +420,11 @@
     # Track the names of all deleted files.
     for f in mresult.files((mergestatemod.ACTION_REMOVE,)):
         deletedfiles.add(f)
-    for f, args, msg in mresult.getactions((mergestatemod.ACTION_MERGE,)):
+    for (f, args, msg) in mresult.getactions((mergestatemod.ACTION_MERGE,)):
         f1, f2, fa, move, anc = args
         if move:
             deletedfiles.add(f1)
-    for f, args, msg in mresult.getactions(
+    for (f, args, msg) in mresult.getactions(
         (mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,)
     ):
         f2, flags = args