Summary

Fix usage of `self.json.append` in `rbt patch`.

Review Request #15156 — Created July 7, 2026 and submitted Aug. 24, 2026, 9:06 a.m.

Information

Owner

david

Repository

RBTools

Branch

master

Bugs

Depends On

Reviewers

Groups

rbtools

People

Description

When there were conflicts, rbt patch called self.json.append()

without first calling self.json.add(..., []). This caused a

KeyError. This change fixes that up.

Testing Done

Applied a patch that had some conflicts and saw that things didn't
crash.

Commits

Summary	ID
Fix usage of `self.json.append` in `rbt patch`. When there were conflicts, `rbt patch` called `self.json.append()` without first calling `self.json.add(..., [])`. This caused a `KeyError`. This change fixes that up. Testing Done: Applied a patch that had some conflicts and saw that things didn't crash.	osktltspsswqssuottqkzpyunnoqkkou

flake8 passed.

JSHint passed.

Expand All
Collapse All

Ship it!

```
Ship It!
```

Ship it!

```
Ship It!
```

Status:: Completed
Change Summary:: Pushed to master (282da71)