FIXCVSDIFF(1)

πŸ“¦
version 0.4.5 Β· 2 versions
  • 0.4.5 Β· alpine 3.22, alpine 3.23, alpine 3.24, arch rolling, centos-stream 10, centos-stream 9, debian bookworm, debian trixie, fedora 43, fedora 44, opensuse-leap 16.0, ubuntu jammy, ubuntu noble, ubuntu questing, ubuntu resolute, ubuntu stonking (latest)
  • 0.3.3 Β· nixos 26.05, nixpkgs unstable
, in alpine 3.22, alpine 3.23, alpine 3.24, arch rolling, centos-stream 10, centos-stream 9, debian bookworm, debian trixie, fedora 43, fedora 44, opensuse-leap 16.0, ubuntu jammy, ubuntu noble, ubuntu questing, ubuntu resolute, ubuntu stonking

πŸ’– FIXCVSDIFF(1) πŸ’–

okay bestie, welcome to fixcvsdiff β€” the little guy from the patchutils family whose whole job is fixing problematic diff files. yes, really, that's the whole name. it fixes diffs. it's giving "I do one thing and I do it flawlessly" ✨


πŸŽ€ SYNOPSIS πŸŽ€

fixcvsdiff [-p] [-b] [file...]

that's it. that's the whole vibe. a couple of flags, some files, done. πŸ’…


🌸 DESCRIPTION 🌸

so here's the tea 🍡 β€” fixcvsdiff modifies diff files created from the cvs diff command, specifically the ones where files have been added or removed.

and why do those need fixing? because CVS tends to create diff files that patch(1) mis-interprets. like, patch reads them and goes "???" and does the wrong thing. not her fault, not your fault, just a CVS situation. 😭

⚠️ important, bestie: the diff file must retain the lines beginning with Index: in order for the correction to work. do not let anything strip those out. they are load-bearing. the whole correction depends on them. periodt. 🫢

✨ OPTIONS ✨

  • -b β€” Keep a .bak backup file. so if anything goes sideways you still have the original sitting right there. safety first, queen. πŸ‘‘
  • -p β€” Print out the cvs add and cvs remove commands that must be made after applying the diff, but before running cvs commit. it literally tells you what to type next, which is iconic behaviour honestly. πŸ”₯

πŸ¦‹ SEE ALSO πŸ¦‹

the whole friend group. go say hi. 🌈


πŸ‘‘ AUTHORS πŸ‘‘

  • Tim Waugh <twaugh@redhat.com> β€” Package maintainer
  • Amir Karger <karger@post.harvard.edu> β€” Author of the original perl script and man page
  • John Levon <moz@compsoc.man.ac.uk> β€” Author of the original perl script and man page

not one, not two, but three whole legends carrying this thing. we stan. πŸ’œ


and that's the page, bestie!! this one came out of <strong>patchutils</strong> and it's dated <strong>7 Dec 2001</strong> β€” old enough to be vintage, still cute enough to slay. mwah. πŸ’‹