sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-19 03:30:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
447610 commits 47 branches 104 tags 1.8 GiB
Commit graph

17 commits

Author SHA1 Message Date
Mathieu Arnold
fb30d2bf17 Run Tools/scripts/mfh through devel/hs-ShellCheck. 
SC2068: Double quote array expansions to avoid re-splitting elements.
SC2034: revs appears unused. Verify it or export it.
SC2039: In POSIX sh, XXX is undefined.
    type     -> command -v
    echo -n  -> printf
    read -p  -> printf + read

SC2162: read without -r will mangle backslashes.
SC2086: Double quote to prevent globbing and word splitting.

Sponsored by:	Absolight
 2018-01-23 15:53:56 +00:00
Mathieu Arnold
033977e70f Follow up on last commit and actually allow editing 
the commit message again.

PR:		224634
Reported by:	yuri
Sponsored by:	Absolight
 2017-12-29 13:20:47 +00:00
Bryan Drewery
5bb2bd091b Allow editing commit message on failure and save it somewhere if declined. 
With hat:       portmgr
 2017-06-12 17:31:56 +00:00
Adam Weinberger
bde099625e Add some usage instructions to the top of the mfh script. In particular, 
note that multiple revisions should appear chronologically.
 2017-05-01 01:06:15 +00:00
Mathieu Arnold
6f4d50b306 Make sure the merge is done on the latest branch. 
Also, make the branch argument optional.

Discussed with:	swills
Sponsored by:	Absolight
 2017-01-03 18:33:19 +00:00
Mathieu Arnold
ab87b34d4e Echo where the merge was done, so one can go and have a look. 
Sponsored by:	Absolight
 2016-08-15 10:01:58 +00:00
Olli Hauer
21b3db57df - add Approved by: line 2016-03-15 16:52:10 +00:00
Mathieu Arnold
d984ba9704 Allow running this with a negative revision number, to backout a commit. 
Sponsored by:	Absolight
 2015-12-18 15:29:38 +00:00
Christian Weisgerber
11982cf73b Default to repo.FreeBSD.org for commits, as urged by our repo meister. 
Approved by:	portmgr (mat)
 2015-09-20 20:56:59 +00:00
Mathieu Arnold
1124f4f901 Actually allow only one revision to be merged. 
Pointy hat to:	mat
Sponsored by:	Absolight
 2015-09-07 12:25:29 +00:00
Mathieu Arnold
628561d9c8 Support merging multiple revisions in one go with mfh. 
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3553
 2015-09-07 12:23:51 +00:00
Bryan Drewery
5d24089a65 - Eat excess newline at the end of the commit log. 2014-08-21 18:47:33 +00:00
Matthias Andree
dd683e1c3a ports/Tools/scripts/mfh revision: 
- use proper quoting
- use fewer svn invocations
- optionally drop to a shell before committing,
  to manually fix up a botched merge.
- svnserver can be overridden in the environment.
- Finally, we use sh's trap builtin to make sure we always clean up.

PR:		186256
Approved by:	portmgr (bapt@)
 2014-06-25 19:04:31 +00:00
Lars Engels
addfd6a6e1 - Allow a leading "r" in the svn revision 
- Use a variable for the Subversion server
- Consistently use ${} around variables
- Bail out if neither svn(1) nor svnlite(1) are installed

Approved by:	bapt
 2014-01-08 22:43:21 +00:00
Baptiste Daroussin
4a0f73b995 Remove ^MFH: lines from the log 2014-01-08 14:45:13 +00:00
Baptiste Daroussin
61c47bcd00 update the tree before merge to avoid having a mixed revision tree before merging 2013-12-26 17:27:19 +00:00
Baptiste Daroussin
afdc465ff0 Import mfh script to merge to the Q branches 2013-12-19 14:43:58 +00:00