Bug 248293 - misc/patchutils: avoid conflict with subversion
Summary: misc/patchutils: avoid conflict with subversion
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Po-Chuan Hsieh
URL:
Keywords:
Depends on:
Blocks: 248256
  Show dependency tree / graph
 
Reported: 2020-07-27 13:12 UTC by Steve Wills
Modified: 2020-07-30 10:06 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (sunpoet)

Attachments
proposed patch (818 bytes, patch)
2020-07-27 13:12 UTC, Steve Wills 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Steve Wills freebsd_committer freebsd_triage 2020-07-27 13:12:20 UTC 
Created attachment 216800 [details]
proposed patch

I really need this not to conflict with subversion. Here's a simple proposed patch which does the job. Probably not the best way, but works for me. Feel free to change or improve or make it optional, etc.
Comment 1 commit-hook freebsd_committer freebsd_triage 2020-07-30 09:54:35 UTC 
A commit references this bug:

Author: sunpoet
Date: Thu Jul 30 09:54:28 UTC 2020
New revision: 543782
URL: https://svnweb.freebsd.org/changeset/ports/543782

Log:
  Remove CONFLICTS by renaming svndiff to svndiff.patchutils

  - Bump PORTREVISION for package change

  PR:		248293
  Submitted by:	swills

Changes:
  head/misc/patchutils/Makefile
  head/misc/patchutils/pkg-plist
Comment 2 Po-Chuan Hsieh freebsd_committer freebsd_triage 2020-07-30 10:06:36 UTC 
Committed. Thanks!