# HG changeset patch
# User Chris Cannam
# Date 1291125087 0
# Node ID a4044b4b3e35945500de1f7aebd21a95e4e66cbb
# Parent  d66fcf2e03422de036efcdd3bca8a7c54299fe5f
 * Include closed branches in heads check (see comment)

diff -r d66fcf2e0342 -r a4044b4b3e35 mainwindow.cpp
--- a/mainwindow.cpp	Tue Nov 30 13:50:58 2010 +0000
+++ b/mainwindow.cpp	Tue Nov 30 13:51:27 2010 +0000
@@ -178,8 +178,12 @@
 void MainWindow::hgQueryHeads()
 {
     QStringList params;
-    params << "heads";
-    // on empty repos, "hg heads" will fail -- we don't care about that.
+    // On empty repos, "hg heads" will fail -- we don't care about
+    // that.  Use --closed option so as to include closed branches;
+    // otherwise we'll be stuck if the user updates into one, and our
+    // incremental log will end up with spurious stuff in it because
+    // we won't be pruning at the ends of closed branches
+    params << "heads" << "--closed";
     runner->requestAction(HgAction(ACT_QUERY_HEADS, workFolderPath, params));
 }