4552. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 6/9/2017 3:51:48 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

4552.1 Files compared

#	Location	File	Last Modified
1			Fri Jun 9 19:51:48 2017 UTC
2	eHealth_Exch (eHealth Exchange Enhancements) Build 3 docs & code_May_2017.zip\VAP_CIF_CODE0502.zip\VAP_CIF_CODE0502\VAP_CIF_CODE0502	copyChangesToRTCAndTag.sh	Fri Apr 21 20:15:58 2017 UTC

4552.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	1	36
Removed	0	0

4552.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

4552.4 Active regular expressions

No regular expressions were active.

4552.5 Comparison detail

				1		#!/bin/bas h
				2
				3		# director ies to inc lude in th e sync.
				4		INCLUDE="F ortify_vap .sh\\|vap.f pr\\|nvap-\ \|lib\\|pom. xml"
				5
				6		# director ies/files to exclude from the sync.
				7		EXCLUDE=". git"
				8
				9		# Location of RTC sa ndbox dire ctory wher e you load ed the DAS sources.
				10		SANDBOX_DI R="../NVAP _vap-2.6.4 "
				11
				12		# name of RTC compon ent/direct ory that c ontains th e sources. This
				13		# should n ever chang e.
				14		COMPONENT_ DIR="NVAP_ vap"
				15
				16		if [ -z "$ 1" -o -z " $2" ]; the n
				17		echo "Us age: copyC hangesAndT ag.sh sinc eTag newTa g"
				18		exit 85
				19		fi
				20
				21		echo "Chan ges since $1."
				22		git diff - -name-stat us $1 HEAD \| grep $I NCLUDE \| g rep -v $EX CLUDE
				23		read -p "P roceed wit h copy (y/ N)? " proc eed
				24
				25		if [ -z "$ proceed" - o "$procee d" != "Y" -a "$proce ed" != "y" ]; then
				26		exit 0
				27		fi
				28
				29		echo "Dele ting files since $1 tag."
				30		git diff - -name-stat us --no-re names "$1" HEAD \| gr ep $INCLUD E \| grep - v $EXCLUDE \| grep ^D \| awk -F "\t" '{ pr int $2 }' \| xargs -I {} rm -v " $SANDBOX_D IR/$COMPON ENT_DIR/{} "
				31
				32		echo "Copy ing change s since $1 tag."
				33		git diff - -name-stat us --no-re names "$1" HEAD \| gr ep $INCLUD E \| grep - v $EXCLUDE \| grep -v ^D \| awk -F "\t" '{ print $2 }' \| xargs -I{} cp - v --parent s "{}" "$S ANDBOX_DIR /$COMPONEN T_DIR/"
				34
				35		echo "Crea ting tag $ 2."
				36		git tag "$ 2"