=== Applying patches on top of PostgreSQL commit ID b384cdb2745b56121426605d985210896555fc05 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu May 7 18:28:22 UTC 2026 On branch cf/6742 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Clean-up-property-graph-error-messages.patch === Applying: Clean up property graph error messages Using index info to reconstruct a base tree... M src/backend/commands/propgraphcmds.c M src/test/regress/expected/create_property_graph.out Falling back to patching base and 3-way merge... Auto-merging src/test/regress/expected/create_property_graph.out CONFLICT (content): Merge conflict in src/test/regress/expected/create_property_graph.out Auto-merging src/backend/commands/propgraphcmds.c CONFLICT (content): Merge conflict in src/backend/commands/propgraphcmds.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Clean up property graph error messages When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./v2-0001-Clean-up-property-graph-error-messages.patch === patching file src/backend/commands/propgraphcmds.c Hunk #4 FAILED at 1270. 1 out of 4 hunks FAILED -- saving rejects to file src/backend/commands/propgraphcmds.c.rej patching file src/test/regress/expected/create_property_graph.out Hunk #1 FAILED at 208. 1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/expected/create_property_graph.out.rej patching file src/test/regress/sql/create_property_graph.sql Unstaged changes after reset: M src/backend/commands/propgraphcmds.c M src/test/regress/sql/create_property_graph.sql Removing src/backend/commands/propgraphcmds.c.rej Removing src/test/regress/expected/create_property_graph.out.rej === using 'git apply' to apply patch ./v2-0001-Clean-up-property-graph-error-messages.patch === Applied patch to 'src/backend/commands/propgraphcmds.c' with conflicts. Applied patch to 'src/test/regress/expected/create_property_graph.out' with conflicts. Applied patch to 'src/test/regress/sql/create_property_graph.sql' cleanly. U src/backend/commands/propgraphcmds.c U src/test/regress/expected/create_property_graph.out diff --cc src/backend/commands/propgraphcmds.c index cc516e27020,6a35ba698ee..00000000000 --- a/src/backend/commands/propgraphcmds.c +++ b/src/backend/commands/propgraphcmds.c @@@ -1266,7 -1270,7 +1270,11 @@@ check_element_label_properties(Oid ella if (diff1 || diff2) ereport(ERROR, errcode(ERRCODE_INVALID_OBJECT_DEFINITION), ++<<<<<<< ours + errmsg("mismatching property names in definition of label \"%s\"", get_propgraph_label_name(labelid))); ++======= + errmsg("mismatched property names in definition of label \"%s\"", get_propgraph_label_name(labelid))); ++>>>>>>> theirs } /* diff --cc src/test/regress/expected/create_property_graph.out index f625524abce,ebb5f70787b..00000000000 --- a/src/test/regress/expected/create_property_graph.out +++ b/src/test/regress/expected/create_property_graph.out @@@ -208,13 -208,13 +208,21 @@@ ERROR: mismatching number of propertie CREATE PROPERTY GRAPH gx VERTEX TABLES ( t1 KEY (a) LABEL l1 PROPERTIES (a, b), - t2 KEY (i) LABEL l1 PROPERTIES (i AS a, j AS j) -- mismatching property names on label + t2 KEY (i) LABEL l1 PROPERTIES (i AS a, j AS j) -- mismatched property names on label ); ++<<<<<<< ours +ERROR: mismatching property names in definition of label "l1" +ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t1 ADD LABEL t3l1 PROPERTIES (a AS x, b AS yy, b AS zz); -- mismatching number of properties on label +ERROR: mismatching number of properties in definition of label "t3l1" +ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t1 ADD LABEL t3l1 PROPERTIES (a AS x, b AS zz); -- mismatching property names on label +ERROR: mismatching property names in definition of label "t3l1" ++======= + ERROR: mismatched property names in definition of label "l1" + ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t1 ADD LABEL t3l1 PROPERTIES (a AS x, b AS yy, b AS zz); -- mismatching number of properties on label + ERROR: mismatching number of properties in definition of label "t3l1" + ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t1 ADD LABEL t3l1 PROPERTIES (a AS x, b AS zz); -- mismatched property names on label + ERROR: mismatched property names in definition of label "t3l1" ++>>>>>>> theirs ALTER PROPERTY GRAPH g4 ALTER VERTEX TABLE t1 ADD LABEL t3l1 PROPERTIES (a AS x); -- mismatching number of properties on label ERROR: mismatching number of properties in definition of label "t3l1" ALTER PROPERTY GRAPH g1 OWNER TO regress_graph_user1;