[Commits] [SCM] claws branch, new-rssyl, updated. 3.10.1-50-gd3f4186

Andrej Kacian andrej at kacian.sk
Fri Jun 13 00:31:54 CEST 2014

On Fri, 13 Jun 2014 00:16:07 +0200
Andrej Kacian <andrej at kacian.sk> wrote:

> On Fri, 13 Jun 2014 00:12:45 +0200
> Colin Leroy <colin at colino.net> wrote:
> > On 13 June 2014 at 00h11, ticho at claws-mail.org wrote:
> > 
> > Hi, 
> > 
> > >     Conflicts:
> > >     	src/plugins/rssyl/Makefile.am
> > > 
> > > diff --cc src/plugins/rssyl/Makefile.am
> > > [...]
> > 
> > Hmm, is that normal?
> I think so - master branch has touched the file (adding the metadata stuff)
> on same place as new-rssyl branch touches it (added SUBDIRS line), so git's
> diff was confused when I merged changed from master to new-rssyl.
> I'm not sure I handled the conflict resolution optimally when it comes to
> commit message, though. :)

By the way, I am keeping a local "new-rssyl-private" branch, so I can rebase
it any way I want, keeping the commit history pretty, with new-rssyl commits
on top. It can be later used for final merging of new RSSyl into master.

For instance, currently its recent history looks like pasted below. Note the
absence of the ugly commit from start of this thread, as well as absence of my
most recent correcting commit (I shamelessly merged it into the previous
so my mistake won't show up in master :) ).

commit 5b774c9d35306149017718971d491fa77a58da55
Author: Andrej Kacian <andrej at kacian.sk>
Date:   Thu Jun 12 23:16:03 2014 +0200

    Use correct values (yes/no instead of 1/0) for HAVE_EXPAT variable in

commit f1742f309c4d6f1fe8127370038dfa9c768c6a86
Author: Colin Leroy <colin at colino.net>
Date:   Thu Jun 12 16:35:20 2014 +0200

    Don't forget the ssl_verify_peer pref when migrating

commit d25d50db9e44d3cd1da3046e0a1b17fb296b9354
Author: Colin Leroy <colin at colino.net>
Date:   Wed Jun 11 17:05:02 2014 +0200

    Migrate the old feeds' caches if possible.

commit bb62f2076cfea087fe67e3b2e328107fc9c5d364
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Mon Jun 2 00:24:21 2014 +0200

    New RSSyl replacing old one.

commit 20d68dd433fd3018131321b78412848795991067
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date:   Fri Jun 13 01:20:57 2014 +0400

    fix automake errors
    src/plugins/fetchinfo/Makefile.am:83: warning: EXTRA_DIST multiply defined
    i src/plugins/fetchinfo/Makefile.am:8: ... 'EXTRA_DIST' previously defined
    her src/plugins/perl/Makefile.am:38: warning: EXTRA_DIST multiply defined
    in con src/plugins/perl/Makefile.am:8: ... 'EXTRA_DIST' previously defined
    here src/plugins/pgpinline/Makefile.am:7: warning: appdata_DATA multiply
    defined src/plugins/pgpinline/Makefile.am:5: ... 'appdata_DATA' previously
    defined h src/plugins/spamassassin/Makefile.am:42: warning: EXTRA_DIST
    multiply define src/plugins/spamassassin/Makefile.am:8: ... 'EXTRA_DIST'
    previously defined 
    Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>


Andrej Kacian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.claws-mail.org/pipermail/commits/attachments/20140613/51bda8fe/attachment-0001.sig>

More information about the Commits mailing list