conflicts on merge has not been totally resolved

1 files changed, 2 insertions, 18 deletions

diff --git a/adbh.py b/adbh.py
index f76dada..30b415d 100644
--- a/adbh.py
+++ b/adbh.py
@@ -338,11 +338,7 @@ class _PGAdvFuncHelper(_GenericAdvFuncHelper):
         cmd.append('--file')
         cmd.append(backupfile)
         cmd.append(dbname)
-<<<<<<< /home/syt/src/fcubicweb/logilab/common/adbh.py
         return [cmd]
-=======
-        return cmd
->>>>>>> /tmp/adbh.py~other.u7LzGS
 
     def restore_commands(self, dbname, dbhost, dbuser, backupfile,
                          encoding='utf-8', keepownership=True, drop=True):
@@ -442,11 +438,7 @@ class _SqliteAdvFuncHelper(_GenericAdvFuncHelper):
 
     def backup_commands(self, dbname, dbhost, dbuser, backupfile,
                        keepownership=True):
-<<<<<<< /home/syt/src/fcubicweb/logilab/common/adbh.py
         return [['gzip', dbname], ['mv', dbname + '.gz', backupfile]]
-=======
-        return ['gzip', dbname], ['mv', dbname + '.gz', backupfile]
->>>>>>> /tmp/adbh.py~other.u7LzGS
 
     def restore_commands(self, dbname, dbhost, dbuser, backupfile,
                          encoding='utf-8', keepownership=True, drop=True):
@@ -505,15 +497,9 @@ class _MyAdvFuncHelper(_GenericAdvFuncHelper):
         cmd = ['mysqldump']
         # XXX compress
         if dbhost is not None:
-<<<<<<< /home/syt/src/fcubicweb/logilab/common/adbh.py
             cmd += ('-h', dbhost)
         cmd += ('-u', dbuser, '-p', '-r', backupfile, dbname)
         return [cmd]
-=======
-            cmd += ('-h', dbhost)
-        cmd += ['-u', dbuser, '-p', '-r', backupfile, dbname]
-        return cmd
->>>>>>> /tmp/adbh.py~other.u7LzGS
 
     def restore_commands(self, dbname, dbhost, dbuser, backupfile,
                          encoding='utf-8', keepownership=True, drop=True):
@@ -595,6 +581,7 @@ class _MyAdvFuncHelper(_GenericAdvFuncHelper):
             allindices += self.list_indices(cursor, table)
         return allindices
 
+
 class _SqlServer2005FuncHelper(_GenericAdvFuncHelper):
     backend_name = 'sqlserver2005'
     ilike_support = False
@@ -620,8 +607,6 @@ class _SqlServer2005FuncHelper(_GenericAdvFuncHelper):
     def binary_value(self, value):
         return StringIO.StringIO(value)
 
-<<<<<<< /home/syt/src/fcubicweb/logilab/common/adbh.py
-
     def backup_commands(self, dbname, dbhost, dbuser, backupfile,
                        keepownership=True):
         return [[sys.executable, os.path.normpath(__file__),
@@ -674,8 +659,7 @@ class _SqlServer2005FuncHelper(_GenericAdvFuncHelper):
         cursor.execute("RESTORE DATABASE ? FROM DISK= ? WITH REPLACE", (dbname, filename,))
         sys.exit(0)
 
-=======
->>>>>>> /tmp/adbh.py~other.u7LzGS
+
 ADV_FUNC_HELPER_DIRECTORY = {'postgres': _PGAdvFuncHelper(),
                              'sqlite': _SqliteAdvFuncHelper(),
                              'mysql': _MyAdvFuncHelper(),