Yourfile),andgreenbandshighlighttextthatisinthesecondfilebutnotthefirstfile.The Theirfile),andpurplebandshighlighttextthatuniquetothatfile.Thegreenicon(
)isassociatedwiththefilethatanotheruseredited( Siblingmodeisusedwhenthereisnodirectrelationshipbetweenthefilesbeingcompared itisset,forexample,whenyoudraganddrop.docxfiles.įormoreinformationabouthowtoselectfilesinP4Vfordiffing,seeDiffingFilesandFoldersintheP4VįilesIfyouandanotheruserhaveeditedthesamefile,( Parent-Childmodeisusedtoshowhowafilehaschangedfromoneversiontoanother thismodeissetwhenyouselectDiff Therearetwo.docxcomparemodes,Parent-ChildandSibling: YoucanalsoviewimagerevisionssequentiallyinTime-lapseView.Formoreinformation,seeViewingImageFileHistorywithTime-lapseViewintheP4VįilesIfyourHelixServeradministratorhasenabledit,youcandiffMicrosoftWord.docxfilesinaP4Mergewindowusingarichcomparisontoolthatshowsdifferencesintext,images,formats,styles,tables,headers,footers,andmanyotherobjects. Increase the amount of an image used in the Overlaidimages,usetheverticalslider:toblendtheimagesequally,centertheslider.To Images,usethezoomslidersorchoosethedesireddisplayoptionfromtheViewmenu.ĭifferencesandusetheadjacentslidertoincreaseordecreasesensitivity.P4Mergehighlightsidenticalareasingrayanddifferencesinyellow. P4VlaunchesP4Merge,displayingthedifferencesbetweenthespecifiedimages.Youcandisplayimagediffssidebysideoroverlaid. History.IntheFileHistorypane,droponeofthedesiredrevisionsontheotherrevision. IfyouarecomparingUnicodefiles,selectionofthecorrectcharactersetisessential.Ifyouselectthewrongcharacterset,P4Mergecannotcorrectlydifffiles.ĭiffing imagesTo diff two different imageĪgainstandspecifytheotherimage,or(intheDepot,Workspace,orFilespane,)droponeimagefilesicononanother.įile:Right-clicktheimagefileandchooseFile Preferences(Windows)orP4Merge > Preferences(Mac).
Method.Toconfigureothersettings,gotoEdit > PreferencesToconfigureP4Mergesettingstodisplayorsuppressdifferencesinwhitespaceandlineendings,click Layout.Insingle-panemode,deletedtextisshownusingstrikethroughtext.Bydefault,P4Mergedisplaysdiffsinaside-by-sidelayout.ĭiffsTomoveforwardandbackthroughindividualdifferences,ortolocatespecifictextorlines,clickthetoolbarbuttonslistedbelow. Todisplaydiffsinasinglepane,gotoView > Single Pane Diff )isassociatedwiththesecondfileyouselected,andgreenbandshighlighttextthatisinthesecondfilebutnotthefirstfile. )isassociatedwiththefirstfileyouselected,andpurplebandshighlighttextthatisinthefirstfilebutnotthesecondfile.Thegreenicon( P4MergeP4Mergeisavisualdifftoolthatdisplaysthedifferencesbetweenfileversionsandhelpsyoutoresolveconflictsandmergecompetingversionsintoone.ĭiffing text files 6NavigateDiffs 6SetPreferences 7ĭiffing images 7Diffing Microsoft Word files 8Merging filesĨNavigateDiffs 8MergeText 9SetPreferences 10įilesInitsdiffmode,P4Mergeenablesyoutocomparetwotextfilestolocatedifferences.(P4Mergecanalsodiffimagefilesand,ifyourHelixServeradministratorhasenabledit,MicrosoftWord.docxfiles.) n Repeatsasmuchasneeded:l alias-name[[$(arg1). Theenclosedelementsareoptional.Omitthebracketswhenyoucomposethecommand. GuideThisguidetellsyouhowtouseP4Merge,4Merge,asitsnameimplies,alsoenablesyoutomergedifferingfilesintoone.ĬonventionsHelixdocumentationusesthefollowingsyntaxconventionstodescribecommandlinesyntax.Īparameterforwhichyoumustsupplyspecificinformation.Forexample,foraserveridparameter,supplytheIDoftheserver. NavigateDiffs 8MergeText 9SetPreferences 10 PerforceandInter-FileBranchingaretrademarksofPerforceSoftware.Īllotherbrandsorproductnamesaretrademarksorregisteredtrademarksoftheirrespectivecompaniesororganizations.ĪnyadditionalsoftwareincludedwithinPerforceSoftwareislistedin"Licensestatements"onpage30.ĭiffing and merging files with P4Merge 6Diffingtextfiles 6 PerforceSoftwareassumesnoresponsibilityorliabilityforanyerrorsorinaccuraciesthatmightappearinthisbook.Bydownloadingandusingourprogramsanddocumentsyouagreetotheseterms. ,alongwithhighercapacityservers,aresoldbyPerforceSoftware. PerforceSoftwareanddocumentationisavailablefromThisproductissubjecttoU.S.exportcontrollawsandregulationsincluding,butnotlimitedto,theU.S.ExportAdministrationRegulations,theInternationalTrafficinArmsRegulationrequirements,andallapplicableend-use,end-useranddestinationrestrictions.Licenseeshallnotpermit,directlyorindirectly,useofanyPerforcetechnologyinorbyanyU.S.embargoedcountryorotherwiseinviolationofanyU.S.exportcontrollawsandregulations.
0 kommentar(er)
