cjwatson | Was the test failure in https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/478061 transient, or does it need some action from me? I can't see the output. | 12:55 |
---|---|---|
gurupras- | cjwatson, checking | 17:41 |
gurupras- | cjwatson, there was a merge conflict in the 'debian/changelog' file that caused the landing to fail | 17:42 |
gurupras- | It looks like someone in the LP team added entries to the changelog after your MP was submitted/source branch was branched but before merge. | 17:43 |
cjwatson | Oh OK, I can resolve that | 17:43 |
=== gurupras- is now known as guruprasad | ||
guruprasad | Can you fix that conflict and push the updated branch up? I will oversee its merge. Thanks! | 17:44 |
cjwatson | guruprasad: Yep, just pushed | 17:45 |
guruprasad | Approved and updated the status. Will wait for the jenkins job to run. | 17:46 |
guruprasad | It has been merged now. Thanks! | 17:47 |
cjwatson | Thank you | 17:47 |
guruprasad | cjwatson, wgrant, do you remember any details about Postgres FTI and/or usage in Launchpad. I noticed some test failures in it when using Postgres 14 (yeah, we are working towards an upgrade all the way to 16 soon) where some '&'s got changed to '<->'s and a '<2>' in one specific case even though the semantics are different. | 18:57 |
guruprasad | While I have proposed https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/480018, I don't think it is doing the right thing. | 18:57 |
guruprasad | Any pointers on specific pieces of LP code to read? | 18:58 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!