Rej

Jul 20, 2023

Merges patch-rejects and runs a merge program to verify the changes

rej tries to merge simple patch-rejects and then run a merge program so the changes can be verified. It is not meant to resolve complex problems that would not be immediately obvious to the programmer, the goal instead is to quickly fix the easy problems.

rej understands both unified and context diffs.

There are four basic rejects fixable via rej.

  1. missing context at the top or bottom of the hunk
  2. different context in the middle of the hunk
  3. slightly different lines removed by the hunk than exist in the file
  4. Large hunks that might apply if they were broken up into smaller ones

rej also allows you to tag hunks in a reject with special processing hints.



Checkout these related ports:
  • Zxfer - Easily and reliably transfer ZFS filesystems
  • Ztop - Display ZFS dataset I/O in real time
  • Zsm - ZFS Snapshot Manager
  • Zsd - Destroys ZFS snapshots
  • Zrepl - ZFS dataset replication tool
  • Zrep - ZFS based replication and failover solution
  • Zpool-iostat-viz - ZFS pool I/O latency statistics
  • Zoxide - Fast cd alternative that learns your habits
  • Zogftw - Creates redundant backups on encrypted ZFS pools
  • Znapzend - ZFS-centric backup tool
  • Zisofs-tools - User utilities for zisofs
  • Zidrav - File corruption detection and repair program
  • Zfstools - OpenSolaris-compatible auto snapshotting for ZFS
  • Zfsnap2 - Portable performant script to make rolling ZFS snapshots easy
  • Zfsnap - Simple sh script to make zfs rolling snaphosts with cron