From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Rex Dieter To: git-commits@fedoraproject.org Subject: [rpms/gdb] fix-dup-patch: fix logic of prior Conflicts Date: Thu, 23 Jul 2026 18:32:42 GMT Message-ID: <178483156230.1.18108434734700642155.rpms-gdb-7fedccf706b0@fedoraproject.org> List-ID: X-Git-Repo: rpms/gdb X-Git-Branch: fix-dup-patch X-Git-Rev: 7fedccf706b0797bfafea2f4b4a84eec39a458b5 ICAgICAgICAgICAgQSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KCiAgICAgICAgICAgIFJl cG8gICA6IHJwbXMvZ2RiCiAgICAgICAgICAgIEJyYW5jaCA6IGZpeC1kdXAtcGF0Y2gKICAgICAg ICAgICAgQ29tbWl0IDogN2ZlZGNjZjcwNmIwNzk3YmZhZmVhMmY0YjRhODRlZWMzOWE0NThiNQog ICAgICAgICAgICBBdXRob3IgOiBSZXggRGlldGVyIDxyZGlldGVyQG1hdGgudW5sLmVkdT4KICAg ICAgICAgICAgRGF0ZSAgIDogMjAxNy0wMS0wMlQxODo1Mjo1Mi0wNjowMAogICAgICAgICAgICBT dGF0cyAgOiArMTAvLTUgaW4gMSBmaWxlKHMpCiAgICAgICAgICAgIFVSTCAgICA6IGh0dHBzOi8v c3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvZ2RiL2MvN2ZlZGNjZjcwNmIwNzk3YmZhZmVhMmY0 YjRhODRlZWMzOWE0NThiNT9icmFuY2g9Zml4LWR1cC1wYXRjaAoKICAgICAgICAgICAgTG9nOgog ICAgICAgICAgICBmaXggbG9naWMgb2YgcHJpb3IgQ29uZmxpY3RzCgp0aGVvcmV0aWNhbGx5IHNo b3VsZCBub3QgYmUgcmVxdWlyZWQgZHVlIHRvIHZlcnNpb25lZCBkZXBlbmRlbnkKb24gLWhlYWRs ZXNzIGFscmVhZHksIGJ1dCBpdCBjYW5ub3QgaHVydCBlaXRoZXIKCi0tLQpkaWZmIC0tZ2l0IGEv Z2RiLnNwZWMgYi9nZGIuc3BlYwppbmRleCBiMTFiZTcwLi5lMTljZDVkIDEwMDY0NAotLS0gYS9n ZGIuc3BlYworKysgYi9nZGIuc3BlYwpAQCAtMjYsNyArMjYsNyBAQCBWZXJzaW9uOiA3LjEyCiAK ICMgVGhlIHJlbGVhc2UgYWx3YXlzIGNvbnRhaW5zIGEgbGVhZGluZyByZXNlcnZlZCBudW1iZXIs IHN0YXJ0IGl0IGF0IDEuCiAjIGB1cHN0cmVhbScgaXMgbm90IGEgcGFydCBvZiBgbmFtZScgdG8g c3RheSBmdWxseSBycG0gZGVwZW5kZW5jaWVzIGNvbXBhdGlibGUgZm9yIHRoZSB0ZXN0aW5nLgot UmVsZWFzZTogMzIlez9kaXN0fQorUmVsZWFzZTogMzMlez9kaXN0fQogCiBMaWNlbnNlOiBHUEx2 MysgYW5kIEdQTHYzKyB3aXRoIGV4Y2VwdGlvbnMgYW5kIEdQTHYyKyBhbmQgR1BMdjIrIHdpdGgg ZXhjZXB0aW9ucyBhbmQgR1BMKyBhbmQgTEdQTHYyKyBhbmQgQlNEIGFuZCBQdWJsaWMgRG9tYWlu IGFuZCBHRkRMCiBHcm91cDogRGV2ZWxvcG1lbnQvRGVidWdnZXJzCkBAIC00Niw2ICs0NiwxMiBA QCBSZWNvbW1lbmRzOiAlez9zY2xfcHJlZml4fWdjYy1nZGItcGx1Z2luJXs/X2lzYX0KICVlbmRp ZgogCiAlaWYgMCV7IT9zY2w6MX0KKyMgd2hlbiBtYW5wYWdlcyB3ZXJlIG1vdmVkIGZyb20gLWhl YWRsZXNzIHRvIG1haW4KKyMgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVnLmNn aT9pZD0xNDAyNTU0CisjIHRoZW9yZXRpY2FsbHkgc2hvdWxkIG5vdCBiZSByZXF1aXJlZCBkdWUg dG8gdmVyc2lvbmVkIGRlcGVuZGVueQorIyBiZWxvdywgYnV0IGl0IGNhbm5vdCBodXJ0IGVpdGhl ciAtLSByZGlldGVyCitDb25mbGljdHM6IGdkYi1oZWFkbGVzcyA8IDcuMTItMjkKKwogU3VtbWFy eTogQSBzdHViIHBhY2thZ2UgZm9yIEdOVSBzb3VyY2UtbGV2ZWwgZGVidWdnZXIKIFJlcXVpcmVz OiBnZGItaGVhZGxlc3Mlez9faXNhfSA9ICV7dmVyc2lvbn0tJXtyZWxlYXNlfQogCkBAIC01NSwx MCArNjEsNiBAQCBTZWUgcGFja2FnZSAnZ2RiLWhlYWRsZXNzJy4KIAogJXBhY2thZ2UgaGVhZGxl c3MKIEdyb3VwOiBEZXZlbG9wbWVudC9EZWJ1Z2dlcnMKLSVlbHNlCi0jIHdoZW4gbWFucGFnZXMg d2VyZSBtb3ZlZCBmcm9tIC1oZWFkbGVzcyB0byBtYWluCi0jIGh0dHBzOi8vYnVnemlsbGEucmVk aGF0LmNvbS9zaG93X2J1Zy5jZ2k/aWQ9MTQwMjU1NAotQ29uZmxpY3RzOiBnZGItaGVhZGxlc3Mg PCA3LjEyLTI5CiAlZW5kaWYKIAogU3VtbWFyeTogQSBHTlUgc291cmNlLWxldmVsIGRlYnVnZ2Vy IGZvciBDLCBDKyssIEZvcnRyYW4sIEdvIGFuZCBvdGhlciBsYW5ndWFnZXMKQEAgLTE1NzcsNiAr MTU3OSw5IEBAIHRoZW4KIGZpCiAKICVjaGFuZ2Vsb2cKKyogTW9uIEphbiAwMiAyMDE3IFJleCBE aWV0ZXIgPHJkaWV0ZXJAZmVkb3JhcHJvamVjdC5vcmc+IC0gNy4xMi0zMworLSBmaXggbG9naWMg b2YgcHJpb3IgQ29uZmxpY3RzCisKICogTW9uIEphbiAwMiAyMDE3IFJleCBEaWV0ZXIgPHJkaWV0 ZXJAZmVkb3JhcHJvamVjdC5vcmc+IC0gNy4xMi0zMgogLSBDb25mbGljdHM6IGdkYi1oZWFkbGVz cyA8IDcuMTItMjkgKCMxNDAyNTU0KQogCg==