Matthias,<br><br>I check my own code, which is what I pushed into master. How am I supposed to know that code pushed ahead of my commit is faulty? Seems like it is the responsibility of the other developers, in this case Supreet. Also, I see that other developers also merge with master in a similar fashion (4 separate developers this month!). How else is this supposed to be done?<br>
<br>Here's how this situation arose. I commit to master. I try to push my changes, oops, there are changes ahead of mine. So I pull, merge, push. Even if I were to pull before I commit, there is a chance someone else will push in between my last pull, and my commit and push attempt.<br>
<br><div class="gmail_quote">On Sat, Mar 17, 2012 at 9:16 PM, Matthias Welwarsky <span dir="ltr"><<a href="mailto:matthias@welwarsky.de">matthias@welwarsky.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
OK, pretty simple:<br>
<br>
It's the patches merged by Ananta Palani, in particular this one:<br>
<br>
commit 8453c8f2def5e917d731aa636eced77e79d4a4a2<br>
Author: Supreet Pal Singh <<a href="mailto:supreetpal@gmail.com">supreetpal@gmail.com</a>><br>
Date: Sat Mar 17 01:32:07 2012 +0530<br>
<br>
Removed the code from setup<br>
<br>
<br>
It removes the loadPlugins() call from the Constructor of KipiPluginLoader<br>
class<br>
<br>
Ananta, can you _please_ check what you are pushing into master? And please,<br>
do not do merge commits. It's very annoying and difficult to eliminate single<br>
patches out of a merge, or even to remove the merge patch entirely.<br>
<br>
See man git-merge:<br>
<br>
-m parent-number, --mainline parent-number<br>
Usually you cannot revert a merge because you do not know which<br>
side of the merge should be considered the<br>
mainline. This option specifies the parent number (starting from 1)<br>
of the mainline and allows revert to reverse<br>
the change relative to the specified parent.<br>
<br>
Reverting a merge commit declares that you will never want the tree<br>
changes brought in by the merge. As a result,<br>
later merges will only bring in tree changes introduced by commits<br>
that are not ancestors of the previously<br>
reverted merge. This may or may not be what you want.<br>
<br>
See the revert-a-faulty-merge How-To[1] for more details.<br>
<br>
This is the How-To mentioned, and if your head is spinning after reading it,<br>
you know why merge commits should not happen if you just want to push changes<br>
into the master branch:<br>
<br>
<a href="http://code.google.com/p/git-core/source/browse/Documentation/howto/revert-a-%0Afaulty-merge.txt" target="_blank">http://code.google.com/p/git-core/source/browse/Documentation/howto/revert-a-<br>
faulty-merge.txt</a><br>
<br>
In my opinion, there is almost never a need for merge commits. Even after you<br>
merged from some other branch, you should still rebase onto the head of the<br>
remote master branch before you commit.<br>
<div class="im HOEnZb"><br>
On Saturday 17 March 2012 21:31:38 Matthias Welwarsky wrote:<br>
</div><div class="HOEnZb"><div class="h5">> Same here, current git master, completely uninstalled, deleted the build<br>
> directory and re-made everything. no kipi-plugins whatsoever.<br>
><br>
> I'm guessing: Some symbol vanished and dlopen fails when the plugin is<br>
> loaded?<br>
><br>
> regards,<br>
> matthias<br>
><br>
> On Saturday 17 March 2012 19:18:03 Veaceslav Munteanu wrote:<br>
> > Hello.<br>
> ><br>
> > I was working with my students on bugs when after a git pull and new<br>
> > build, all kipi-plugins are missing.<br>
> > We have the same problem on all 3 computers and it's a result of a<br>
> > recent<br>
> > commit, because i pulled this morning and everything was ok and after a<br>
> > hour it was broken.<br>
> ><br>
> > Can you help me?<br>
><br>
> _______________________________________________<br>
> Digikam-devel mailing list<br>
> <a href="mailto:Digikam-devel@kde.org">Digikam-devel@kde.org</a><br>
> <a href="https://mail.kde.org/mailman/listinfo/digikam-devel" target="_blank">https://mail.kde.org/mailman/listinfo/digikam-devel</a><br>
_______________________________________________<br>
Digikam-devel mailing list<br>
<a href="mailto:Digikam-devel@kde.org">Digikam-devel@kde.org</a><br>
<a href="https://mail.kde.org/mailman/listinfo/digikam-devel" target="_blank">https://mail.kde.org/mailman/listinfo/digikam-devel</a><br>
</div></div></blockquote></div><br>