Package: git Version: 1:1.7.5.1-1 Severity: wishlist Tags: upstream Forwarded: http://thread.gmane.org/gmane.comp.version-control.git/173615
dpkg occasionally runs into merge conflicts when po files are updated on the wrong branch. The underlying problem is that the translations are an unfortunate mixture of human-generated and machine-generated content. The line numbers are especially problematic, of course. Junio C Hamano wrote: > I would rather see that done as a customized content-level merge backend, > i.e. at the same level as binary and union merges are specified. Losing > line number information just for the sake of the generic merge that does > not have domain knowledge (read: "stupid") is a way suboptimal solution to > the problem, I would think. To be more precise about what this merge backend might accomplish: . line numbers get fixed up so the po file corresponds to the content in the merge result; . fixes to the translations for a string are integrated automatically (no spurious conflicts for that just because a line number changed); . strings are sorted in some standard order to avoid spurious differences; . fuzzies result in files being declared unmerged, so they can be inspected and fixed up. Well, something like that. :) -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
