Bug 267681 - New port: textproc/py-merge3
Summary: New port: textproc/py-merge3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Robert Clausecker
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-11-10 01:36 UTC by fullermd
Modified: 2023-05-25 09:51 UTC (History)
1 user (show)

See Also:

Attachments
New port (2.33 KB, patch)
2022-11-10 01:36 UTC, fullermd 		no flags Details | Diff
New port (2.33 KB, patch)
2022-11-22 23:32 UTC, fullermd 		no flags Details | Diff
New port (0.0.13) (2.33 KB, patch)
2023-03-26 22:00 UTC, fullermd 		no flags Details | Diff
Show Obsolete (2) 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 fullermd 2022-11-10 01:36:34 UTC 
Created attachment 237993 [details]
New port

New port for Python implementation of 3-way merge.

Will be needed for future versions of devel/brz
Comment 1 fullermd 2022-11-22 23:32:08 UTC 
Created attachment 238267 [details]
New port

Updated for new release
Comment 2 fullermd 2023-03-26 22:00:09 UTC 
Created attachment 241131 [details]
New port (0.0.13)

Update to current upstream release.
Comment 3 Robert Clausecker freebsd_committer freebsd_triage 2023-05-24 09:22:28 UTC 
I'm sorry for the slow processing.  Will commit with my next batch.
Comment 4 commit-hook freebsd_committer freebsd_triage 2023-05-25 09:44:59 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=482b709de36de5949cb55d43da9b08bc51bcc07c

commit 482b709de36de5949cb55d43da9b08bc51bcc07c
Author:     Matthew D. Fuller <fullermd@over-yonder.net>
AuthorDate: 2023-03-26 21:55:28 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-05-25 09:39:34 +0000

    textproc/py-merge3: new port

    A Python implementation of 3-way merge of texts.

    Given BASE, OTHER, THIS, tries to produce a combined text incorporating
    the changes from both BASE->OTHER and BASE->THIS. All three will
    typically be sequences of lines.

    WWW: https://github.com/breezy-team/merge3

    PR:             267681

 textproc/Makefile                  |  1 +
 textproc/py-merge3/Makefile (new)  | 19 +++++++++++++++++++
 textproc/py-merge3/distinfo (new)  |  3 +++
 textproc/py-merge3/pkg-descr (new) |  5 +++++
 4 files changed, 28 insertions(+)
Comment 5 Robert Clausecker freebsd_committer freebsd_triage 2023-05-25 09:51:38 UTC 
Thank you for your submission.