Validate when moving a file

Signed-off-by: Uilian Ries <uilianr@jfrog.com>

Author: uilianries

tests/movefile/0001-quote.patch

@@ -0,0 +1,61 @@
+From 90ffe300b588f40f1409deb414498af8bc681072 Mon Sep 17 00:00:00 2001
+From: John Doe <john.doe@mail.com>
+Date: Fri, 3 Oct 2025 11:28:55 +0200
+Subject: [PATCH 1/3] Add file
+
+Signed-off-by: John Doe <john.doe@mail.com>
+---
+ quotes.txt | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 quotes.txt
+
+diff --git a/quotes.txt b/quotes.txt
+new file mode 100644
+index 0000000000000000000000000000000000000000..6da41619625400f0b6c99beccc47c328f3967366
+--- /dev/null
++++ b/quotes.txt
+@@ -0,0 +1 @@
++in herbis, salus.
+-- 
+2.51.0
+
+
+From a055d1be31d11c149bfd9ca88d9554199d57d444 Mon Sep 17 00:00:00 2001
+From: John Doe <john.doe@mail.com>
+Date: Fri, 3 Oct 2025 11:29:27 +0200
+Subject: [PATCH 2/3] Move file
+
+Signed-off-by: John Doe <john.doe@mail.com>
+---
+ quotes.txt => quote/quotes.txt | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename quotes.txt => quote/quotes.txt (100%)
+
+diff --git a/quotes.txt b/quote/quotes.txt
+similarity index 100%
+rename from quotes.txt
+rename to quote/quotes.txt
+-- 
+2.51.0
+
+
+From c275530ce83dc6eeeae671c2082660f1b6c16c4f Mon Sep 17 00:00:00 2001
+From: John Doe <john.doe@mail.com>
+Date: Fri, 3 Oct 2025 11:30:14 +0200
+Subject: [PATCH 3/3] Update quote
+
+Signed-off-by: John Doe <john.doe@mail.com>
+---
+ quote/quotes.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/quote/quotes.txt b/quote/quotes.txt
+index 6da41619625400f0b6c99beccc47c328f3967366..928532e38b2a8e607814da280bb9e02862d2b4ea 100644
+--- a/quote/quotes.txt
++++ b/quote/quotes.txt
+@@ -1 +1 @@
+-in herbis, salus.
++dum tempus habemus, operemur bonum.
+-- 
+2.51.0
+

tests/run_tests.py

@@ -557,6 +557,33 @@ def test_apply_patch_only_file_mode(self):
         self.assertTrue(pto.apply())
         self.assertEqual(os.stat(join(self.tmpdir, 'quote.txt')).st_mode, 0o644 | stat.S_IFREG)
 
+class TestMoveAndPatch(unittest.TestCase):
+
+    def setUp(self):
+        self.save_cwd = os.getcwd()
+        self.tmpdir = mkdtemp(prefix=self.__class__.__name__)
+        shutil.copytree(join(TESTS, 'movefile'), join(self.tmpdir, 'movefile'))
+
+    def tearDown(self):
+        os.chdir(self.save_cwd)
+        remove_tree_force(self.tmpdir)
+
+    def test_add_move_and_update_file(self):
+        """When a patch file contains a file move (rename) and an update to the file,
+           the patch should be applied correctly.
+
+           Reported by https://github.com/conan-io/python-patch-ng/issues/24
+        """
+
+        os.chdir(self.tmpdir)
+        pto = patch_ng.fromfile(join(self.tmpdir, 'movefile', '0001-quote.patch'))
+        self.assertEqual(len(pto), 2)
+        self.assertEqual(pto.items[0].type, patch_ng.GIT)
+        self.assertEqual(pto.items[1].type, patch_ng.GIT)
+        self.assertTrue(pto.apply())
+        self.assertTrue(os.path.exists(join(self.tmpdir, 'quote', 'quotes.txt')))
+
+
 class TestHelpers(unittest.TestCase):
     # unittest setting
     longMessage = True