KDevelop 3.4.1 frozen for release
Andreas Pakulat
apaku at gmx.de
Wed May 2 20:00:18 UTC 2007
On 02.05.07 14:29:45, Matt Rogers wrote:
> Hi,
>
> I'm making an executive decision and freezing KDevelop 3.4.1 for
> release. Anything that anyone wants to commit to the KDE 3.5 branch
> (where KDevelop 3.4.1 resides now after the move) must be approved.
> If a commit does not having a matching review associated with it, it
> will be reverted. You can prevent your commits being reverted by
> having text that reads "approved by Alexander Dymo", for example, in
> your commit message.
Fine with me, but here's a patch that I hope will be a approved because
the current behaviour is just unusual and unexpected. It changes the
logic of the subversion "Diff To HEAD" menu item to do a diff between
the file on disk and the latest version in the repository. Here file on
disk means the file that I may have changed, not the file as it was
after the last update (without my local changes). This way diff-to-head
works the same way as a command line svn diff, which IMHO is much more
usable than the diff-between-base-and-head that was there before.
Andreas
--
Among the lucky, you are the chosen one.
-------------- next part --------------
Index: vcs/subversion/subversion_part.cpp
===================================================================
--- vcs/subversion/subversion_part.cpp (Revision 660336)
+++ vcs/subversion/subversion_part.cpp (Arbeitskopie)
@@ -520,7 +520,7 @@ void subversionPart::slotDiffHead() {
i18n("Select file or directory to see diff") );
return;
}
- m_impl->diffAsync( *(m_urls.begin()), *(m_urls.begin()), -1, "BASE", -1, "HEAD", true );
+ m_impl->diffAsync( *(m_urls.begin()), *(m_urls.begin()), -1, "WORKING", -1, "HEAD", true );
}
void subversionPart::slotDiffWorkingHead() {
Index: vcs/subversion/subversion_fileinfo.h
===================================================================
More information about the KDevelop-devel
mailing list