6 commits

Author	SHA1	Message	Date
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