laumann/ani - Change O7XAUFM6CCSFXSBTGOMVHRUQFJEWPO6YLNO52OT3AZ4GYN6JJONAC

change: decode and print {,un}solve order conflicts

Created by laumann on June 28, 2023

O7XAUFM6CCSFXSBTGOMVHRUQFJEWPO6YLNO52OT3AZ4GYN6JJONAC

Dependencies

In channels

main

Change contents

Insertion in hunk.h at line 64 [5.664]

[3.49]

[4.899]

};
struct solveorderconflict {
	struct atom change;
	struct local local;
};
struct unsolveorderconflict {
	struct atom change;
	struct local local;

Insertion in hunk.h at line 85 [5.664]

[4.1115]

[6.417]

		struct solveorderconflict solveorderconflict;
		struct unsolveorderconflict unsolveorderconflict;

Insertion in change.c at line 366 [8.1047]

[2.407]

[7.344]

			);
			break;
		case SOLVE_ORDER_CONFLICT:
			change_decode_atom(
				binstat, &bhunk->solveorderconflict.change
			);
			change_decode_local(
				binstat, &bhunk->solveorderconflict.local
			);
			break;
		case UNSOLVE_ORDER_CONFLICT:
			change_decode_atom(
				binstat, &bhunk->unsolveorderconflict.change
			);
			change_decode_local(
				binstat, &bhunk->unsolveorderconflict.local

Insertion in change.c at line 745 [8.1047]

[7.438]

			break;
		}
		case SOLVE_ORDER_CONFLICT: {
			struct solveorderconflict *s =
				&hunk->solveorderconflict;
			printf(" in %s:%lu\n", s->local.path, s->local.line);
			break;
		}
		case UNSOLVE_ORDER_CONFLICT: {
			struct unsolveorderconflict *s =
				&hunk->unsolveorderconflict;
			printf(" in %s:%lu\n", s->local.path, s->local.line);