After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 629654 - git stash pop failure due to merge conflict
git stash pop failure due to merge conflict
Status: RESOLVED DUPLICATE of bug 661128
Product: gdk-pixbuf
Classification: Platform
Component: general
git master
Other Linux
: Normal normal
: ---
Assigned To: gdk-pixbuf-maint
gdk-pixbuf-maint
Depends on:
Blocks:
 
 
Reported: 2010-09-14 12:32 UTC by Giovanni Campagna
Modified: 2011-12-16 23:23 UTC
See Also:
GNOME target: ---
GNOME version: ---


Description Giovanni Campagna 2010-09-14 12:32:19 UTC 
Every time I call jhbuild update gdk-pixbuf, the following commands are invoked:
git stash jhbuild-stash
git pull --rebase
git stash pop

Unfortunately this works cleanly only if the stash does not contain files that are modified by git pull, else it will fail with a merge conflict.

In the specific case of gdk-pixbuf it contains all the translation files, which are regenerated by msgmerge when building or installing, so if a translation is changed upstream git will complain, stopping the build.
Comment 1 Jon Nordby 2011-03-01 23:14:34 UTC 
Confirmed. 
To me, the problem seems to be because the .pot file is regenerated after a fresh git checkout, and as a result of that the .po files are updated using msgmerge.
Neither glib nor gtk updated the pot file as part of a normal checkout+build.
Comment 2 sean finney 2011-08-11 12:39:22 UTC 
yeah, it's more than just a bit annoying actually, because even if there aren't merge conflicts, jhbuild will often think that gdk-pixbuf needs to be rebuilt (not sure what gives it the false positive there) even if there are no updates, causing half of your build tree (gtk, etc) to get rebuilt...
Comment 3 Matthias Clasen 2011-12-16 23:23:11 UTC 

*** This bug has been marked as a duplicate of bug 661128 ***