Hi there! On Wed, 17 Aug 2011 11:52:47 +0200, Arnaud Fontaine wrote: >> Sorry to bother you, but my merge has failed, and I don't know why. I >> retitled this >> bug(http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=526936 ) and make >> myself as owner, but merge 526936 637892 has failed. > > No problem at all. As far as I can see on the bug report, it worked > because it displays 'Merged with...'. No, the merge command Shell Xu issued contained a non-breaking space, thus it did not work: <http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=41;mbox=yes;bug=526936> Then Aron Xu fixed it with a forcemerge (AFAIK not strictly needed in this case): <http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=43;mbox=yes;bug=526936> >> And, I almost finish my job. But which bugnumber should I fill into >> changelog? The new one or both? > > Only one (any of them), as explained there[0]. While any of them is correct, I would say that chronologically the first one takes precedence ;-) Thx, bye, Gismo / Luca
Attachment:
pgpvSqSfP7gox.pgp
Description: PGP signature