https://bugzilla.novell.com/show_bug.cgi?id=896837 https://bugzilla.novell.com/show_bug.cgi?id=896837#c1 Adrian Schröter <adrian@suse.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Component|OBS Request |backend Version|unspecified |master AssignedTo|mrueckert@suse.com |mls@suse.com Product|openSUSE.org |openSUSE Build Service --- Comment #1 from Adrian Schröter <adrian@suse.com> 2014-09-16 08:27:25 UTC --- diff3 is not able to see that the Update to 4.0.10 block is new on both sides, based on the basrev revision. Could only be improved by having special .changes format merge code, independend of diff3 But the other question is why baserev got not increased. The submission before to factory came also via this project via request 239160 . There was not even a new commit in devel project when the request got accepted. Michael, can you have a look? -- Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.