Mercurial > hg > easyhg

diff mainwindow.h @ 237:c9a7e4ec2f78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Try to do the right thing when completely reverting a merge (forget that the merge took place) * When trying to clone from remote repo to existing local dir, offer to create a subdir instead * Tidy up clone-successful notification * Add a note to commit and revert confirmation dialogs to tell user if they are committing/reverting only a subset of available files
author Chris Cannam
date Mon, 10 Jan 2011 12:44:03 +0000
parents e67bd8abc3e3
children e2f2c6e3c01b
line wrap: on
line diff
--- a/mainwindow.h	Sun Jan 09 10:08:42 2011 +0000
+++ b/mainwindow.h	Mon Jan 10 12:44:03 2011 +0000
@@ -138,7 +138,7 @@
     bool complainAboutInitFile(QString);
     bool complainAboutCloneToExisting(QString);
     bool complainAboutCloneToFile(QString);
-    bool complainAboutCloneToExistingFolder(QString); //!!! not sure about this one
+    QString complainAboutCloneToExistingFolder(QString local, QString remote); // returns new location, or empty string for cancel
 
     bool askToInitExisting(QString);
     bool askToInitNew(QString);