Mercurial > hg > easyhg
comparison mainwindow.h @ 237:c9a7e4ec2f78
* 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 |
comparison
equal
deleted
inserted
replaced
236:960b782f0a64 | 237:c9a7e4ec2f78 |
---|---|
136 bool complainAboutUnknownFolder(QString); | 136 bool complainAboutUnknownFolder(QString); |
137 bool complainAboutInitInRepo(QString); | 137 bool complainAboutInitInRepo(QString); |
138 bool complainAboutInitFile(QString); | 138 bool complainAboutInitFile(QString); |
139 bool complainAboutCloneToExisting(QString); | 139 bool complainAboutCloneToExisting(QString); |
140 bool complainAboutCloneToFile(QString); | 140 bool complainAboutCloneToFile(QString); |
141 bool complainAboutCloneToExistingFolder(QString); //!!! not sure about this one | 141 QString complainAboutCloneToExistingFolder(QString local, QString remote); // returns new location, or empty string for cancel |
142 | 142 |
143 bool askToInitExisting(QString); | 143 bool askToInitExisting(QString); |
144 bool askToInitNew(QString); | 144 bool askToInitNew(QString); |
145 bool askToOpenParentRepo(QString, QString); | 145 bool askToOpenParentRepo(QString, QString); |
146 bool askToOpenInsteadOfInit(QString); | 146 bool askToOpenInsteadOfInit(QString); |