[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: Re: KDE/kdepim/kleopatra/commands
From: Allen Winter <winter () kde ! org>
Date: 2010-01-15 14:09:47
Message-ID: 201001150909.47342.winter () kde ! org
[Download RAW message or body]
On Friday 15 January 2010 4:55:49 am Bernhard Reiter wrote:
> Am Donnerstag, 14. Januar 2010 16:04:40 schrieb Thomas McGuire:
> > On Thursday 14 January 2010 11:44:04 Bernhard Reiter wrote:
> > > SVN commit 1074582 by breiter:
> > >
> > > (forward ported from r1074457)
> > > Made the crl importing selection filefilter hint more explicit,
> > > only DER encoded files will work. (Motivated by real user feedback,
> > > indicating that the file suffixes are not enough to notice and understand
> > > the restriction.)
> >
> > Thanks for this Kleopatra fix.
> >
> > You have merged that commit manually from the enterprise35 branch to trunk.
> > This bypasses merge tracking and the enterprise4 branch.
> > This causes more work for us, as we can't rely on the merge tracking and
> > have to fix things manually.
>
> I did think about merge tracking and I spoke to Marc Mutz, the maintainer of
> Kleopatra before comitting. The reason why I did choose the manual way was:
> a) I wasn't sure if you would see and merge it. (We thought: Maybe) So I've
> decided to merge it.
> b) I could not find out very quickly how the merge tracking works, so I did
> not want to mess it up by some clumsy handling. Secondly I wasn't sure how
> close the code has to be to be merged.
>
> > So please don't do manual merges in the future, Allen and me will do them
> > using svnmerge.py.
>
> Thanks for the Info, I know now that you are indeed tracking this.
> (I would welcome a privat link to the info how merge tracking is done in that
> part of KDE. )
>
> Thanks a lot for the feedback and sorry again for the noise,
> Bernhard
Hi Bernhard,
Another possibility is to simply send the patch to me and Thomas.
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic