#
#
# patch "NEWS"
#  from [c4de65890e8b1cca5f2c620524d61645913b5f60]
#    to [a8f476eb2e59b4bed8618526f4d7c5c48d35de8e]
# 
# patch "src/model/GetRevision.cpp"
#  from [7561bccabe38f3202931a7ac485c0d907395f892]
#    to [5d84f72f0ba84421c95832c4a7f72c76c859cd70]
# 
# patch "src/monotone/WorkspaceCommitter.cpp"
#  from [94b1e92f38a51f424c06c3ce4cf4ac0195c22fa5]
#    to [552526dc9dacf546ad039cbaa2bf03d7609cdc4d]
# 
# patch "src/view/dialogs/CommitRevision.cpp"
#  from [c5f86e5286fb9f0ab1e73f7f38ea0d6698942fc8]
#    to [961367f97bfd8c5ac804752bda21e17f6a92961d]
#
============================================================
--- NEWS	c4de65890e8b1cca5f2c620524d61645913b5f60
+++ NEWS	a8f476eb2e59b4bed8618526f4d7c5c48d35de8e
@@ -29,6 +29,10 @@
    next time.
  - bugfix: no longer crash if a renamed file (target) is inspected via the
    node info panel
+ - bugfix: clear previous parents from the parent dropdown in the commit dialog;
+   also disable the dropdown if there are no parents for the check-in
+ - bugfix: remove a stupidity which prevented the ability to commit only
+   non-content changes 
 
 2008-10-04 (0.9)
  - new: panel to inspect an selected workspace item - shows several mtn and
============================================================
--- src/model/GetRevision.cpp	7561bccabe38f3202931a7ac485c0d907395f892
+++ src/model/GetRevision.cpp	5d84f72f0ba84421c95832c4a7f72c76c859cd70
@@ -284,16 +284,25 @@ QStringList GetRevision::getParentRevisi
 
 QStringList GetRevision::getParentRevisions() const
 {
-    return revision.changesAgainstParent.keys();
+    QStringList parents = revision.changesAgainstParent.keys();
+    if (parents.size() == 1 && parents.at(0) == "")
+        return QStringList();
+    return parents;
 }
 
 void GetRevision::showChangesAgainstParent(const QString & parent)
 {
     QStringList parents = getParentRevisions();
-
-    if (!parents.contains(parent)) return;
-
-    currentParentRevision = parent;
+    if (parents.size() == 0)
+    {
+        currentParentRevision = QString("");
+    }
+    else
+    {
+        if (!parents.contains(parent))
+            return;
+        currentParentRevision = parent;
+    }
     reset();
 }
 
============================================================
--- src/monotone/WorkspaceCommitter.cpp	94b1e92f38a51f424c06c3ce4cf4ac0195c22fa5
+++ src/monotone/WorkspaceCommitter.cpp	552526dc9dacf546ad039cbaa2bf03d7609cdc4d
@@ -52,19 +52,13 @@ bool WorkspaceCommitter::run(const QStri
     I(workspaceDir.exists());
 
     //
-    // Check the current revision text for file content changes
+    // Check the current revision text for file content changes and
+    // process all of them
     //
-
     QMap<QString, QPair<QString, QString> > changedFiles =
         revModel->getChangedFiles();
+    QMapIterator<QString, QPair<QString, QString> > it(changedFiles);
 
-    if (changedFiles.size() == 0)
-        return false;
-
-    //
-    // put all found files
-    //
-    QMapIterator<QString, QPair<QString, QString> > it(changedFiles);
     while (it.hasNext())
     {
         it.next();
============================================================
--- src/view/dialogs/CommitRevision.cpp	c5f86e5286fb9f0ab1e73f7f38ea0d6698942fc8
+++ src/view/dialogs/CommitRevision.cpp	961367f97bfd8c5ac804752bda21e17f6a92961d
@@ -207,8 +207,19 @@ void CommitRevision::revisionRead()
 
 void CommitRevision::revisionRead()
 {
-    changesAgainstParent->addItems(revModel->getParentRevisions());
+    changesAgainstParent->clear();
 
+    QStringList parents = revModel->getParentRevisions();
+    if (parents.size() > 0)
+    {
+        changesAgainstParent->addItems(parents);
+        changesAgainstParent->setEnabled(true);
+    }
+    else
+    {
+        changesAgainstParent->setEnabled(false);
+    }
+
     if (!Settings::getBool("DisableChangelogAutoCompletion"))
     {
         changelogEntry->setCompleterStrings(revModel->getPathsForCompletion());