# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 2014-08-07 17:54:17
# Node ID 2990ce46fc2d33b9bc197eaefa36cf5d3c28b434
# Parent  e59b5e5918a5f7060583ec92ce10d5dad60520a6

transaction: backup file in a dedicated "namespace"

File backup may conflict with other "journal.*" file. We add a fixed part in the
backup name file to prevent it.

diff --git a/mercurial/transaction.py b/mercurial/transaction.py
--- a/mercurial/transaction.py
+++ b/mercurial/transaction.py
@@ -154,7 +154,7 @@ class transaction(object):
 
         if file in self.map or file in self.backupmap:
             return
-        backupfile = "%s.%s" % (self.journal, file)
+        backupfile = "%s.backup.%s" % (self.journal, file)
         if self.opener.exists(file):
             filepath = self.opener.join(file)
             backuppath = self.opener.join(backupfile)