diff --git a/ChangeLog b/ChangeLog index 9f60c29e1..95bc1afbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,12 @@ +2007-06-19 Alex Roitman + * src/DbManager.py (check_in): Add -f option to ci to force + checking even if it is identical. + 2007-06-19 Don Allingham * src/DbManager.py: handle RCS init properly, don't use gziped files * src/GrampsDbUtils/_WriteXML.py: pass compress argument properly -2007-06-19 Alex Roitman +2007-06-19 Alex Roitman * src/FilterEditor/_FilterEditor.py (_find_dependent_filters): Add method to first find all filters fo deletion. diff --git a/src/DbManager.py b/src/DbManager.py index 4788174e5..fb8806149 100644 --- a/src/DbManager.py +++ b/src/DbManager.py @@ -550,8 +550,8 @@ def find_revisions(name): return revlist def check_in(db, filename, callback): - init = [ "rcs", '-i', '-U', '-q', '-t-GRAMPS database', ] - ci = [ "ci", "-q" ] + init = [ "rcs", '-i', '-U', '-q', '-t-"GRAMPS database"', ] + ci = [ "ci", "-q", "-f" ] glade = gtk.glade.XML(const.gladeFile, "comment", "gramps") top = glade.get_widget('comment') @@ -562,7 +562,8 @@ def check_in(db, filename, callback): top.destroy() if not os.path.isfile(filename + ",v") : - proc = subprocess.Popen(init + [filename + ",v"], stderr = subprocess.PIPE) + proc = subprocess.Popen(init + [filename + ",v"], + stderr = subprocess.PIPE) status = proc.wait() message = "\n".join(proc.stderr.readlines()) proc.stderr.close()