Help: diffs

Diff Formats

Mercurial's default format for showing changes between two versions of a file is compatible with the unified format of GNU diff, which can be used by GNU patch and many other standard tools.

While this standard format is often enough, it does not encode the following information:

  • executable status and other permission bits
  • copy or rename information
  • changes in binary files
  • creation or deletion of empty files

Mercurial also supports the extended diff format from the git VCS which addresses these limitations. The git diff format is not produced by default because a few widespread tools still do not understand this format.

This means that when generating diffs from a Mercurial repository (e.g. with 'hg export'), you should be careful about things like file copies and renames or other things mentioned above, because when applying a standard diff to a different repository, this extra information is lost. Mercurial's internal operations (like push and pull) are not affected by this, because they use an internal binary format for communicating changes.

To make Mercurial produce the git extended diff format, use the --git option available for many commands, or set 'git = True' in the [diff] section of your configuration file. You do not need to set this option when importing diffs in this format or using them in the mq extension.

PK|\Ok|2 mothur_chimera_check-4b57c3241cbc/.hg_archival.txtUT]PK|\O[i~ ( mothur_chimera_check-4b57c3241cbc/READMEUT]PK|\O ,3 mothur_chimera_check-4b57c3241cbc/chimera.check.xmlUT]PK|\Owi;o:, mothur_chimera_check-4b57c3241cbc/macros.xmlUT]PK|\OztqVTD mothur_chimera_check-4b57c3241cbc/test-data/98_sq_phylip_amazon.distUT]PK|\Ou B Dmothur_chimera_check-4b57c3241cbc/test-data/Fasting_Example1.fastaUT]PK|\OR A mothur_chimera_check-4b57c3241cbc/test-data/Fasting_Example1.qualUT]PK|\OD\ZAF mothur_chimera_check-4b57c3241cbc/test-data/Fasting_Example1.scrap.sffUT]PK|\O&TA@ mothur_chimera_check-4b57c3241cbc/test-data/Fasting_Example1.sffUT]PK|\O<0A@ mothur_chimera_check-4b57c3241cbc/test-data/Fasting_Example2.sffUT]PK|\OIROB< Lmothur_chimera_check-4b57c3241cbc/test-data/GQY1XT001.oligosUT]PK|\O:RY#Zl> Gmothur_chimera_check-4b57c3241cbc/test-data/HMP_MOCK.v35.alignUT]PK|\O=#D Emothur_chimera_check-4b57c3241cbc/test-data/HMP_MOCK.v35.align.namesUT]PK|\O̎Qx D> }Gmothur_chimera_check-4b57c3241cbc/test-data/HMP_MOCK.v35.fastaUT]PK|\OcuO E jRmothur_chimera_check-4b57c3241cbc/test-data/HMP_MOCK.v35.pintail.quanUT]PK|\O H [Umothur_chimera_check-4b57c3241cbc/test-data/HMP_MOCK.v35.slayer.chimerasUT]PK|\Ou+AME Vmothur_chimera_check-4b57c3241cbc/test-data/HMPv5-v3_1368-1369.oligosUT]PK|\OpoF$? Wmothur_chimera_check-4b57c3241cbc/test-data/LookUp_Titanium.patUT]PK|\O!Rwh mothur_chimera_check-4b57c3241cbc/test-data/M00967_43_000000000-A3JHG_1_1101_14010_4122.chimeracheck.svgUT]PK|\O^qRV mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.contigs.reportUT]PK|\Oh6M mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.fastqUT]PK|\OJ*E_ mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.bad.accnosUT]PK|\O'SBZ mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.fastaUT]PK|\O6B< mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.Mock_S280_L001_R1_001_small.trim.contigs.good.groupsUT]PK|\OnIj f $mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.align.reportUT]PK|\O8d +mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.align_headUT]PK|\O*cOmj imothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.align_head.namesUT]PK|\O*y yJp mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.align_head_withchimeraUT]PK|\Opy l $ mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.bellerophon.accnosUT]PK|\O &+f @mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.ccode.accnosUT]PK|\O*2o mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.chimeracheck.chimerasUT]PK|\OEvF{ld mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.chop.fastaUT]PK|\OZp mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.denovo.uchime.chimerasUT]PK|\O\~g Wmothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.error.summaryUT]PK|\Om_ mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.fastaUT]PK|\O, >_ mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.namesUT]PK|\OiHd mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.names_tinyUT]PK|\O0 b mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.ng.fastaUT]PK|\O_Gh mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.pintail.accnosUT]PK|\O,;E g mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.rc.align_headUT]PK|\O&,k "mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.ref.uchime.accnosUT]PK|\Ou~Si #mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.ref.uchime.alnsUT]PK|\OQMfm &mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.ref.uchime.chimerasUT]PK|\OX{Mi (mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.slayer.chimerasUT]PK|\ODvfkk e)mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.good.unique.align_headUT]PK|\O:n!NY "8mothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.qualUT]PK|\Oy)1\ Hmothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R1_001_small.trim.contigs.summaryUT]PK|\OL6M Imothur_chimera_check-4b57c3241cbc/test-data/Mock_S280_L001_R2_001_small.fastqUT]PK|\O eU+{< j[mothur_chimera_check-4b57c3241cbc/test-data/abrecovery.fastaUT]PK|\Oa+'W = 2mothur_chimera_check-4b57c3241cbc/test-data/abrecovery.groupsUT]PK|\Ob< Imothur_chimera_check-4b57c3241cbc/test-data/abrecovery.namesUT]PK|\Oz}; % vH mothur_chimera_check-4b57c3241cbc/test-data/abrecovery.pds.wang.taxonomyUT]PK|\OwH ”mothur_chimera_check-4b57c3241cbc/test-data/abrecovery.pds.wang.tree.sumUT]PK|\O : ߙmothur_chimera_check-4b57c3241cbc/test-data/abrecovery.treUT]PK|\OquC Lmothur_chimera_check-4b57c3241cbc/test-data/amazon.accnos.otulabelsUT]PK|\O24  J= ףmothur_chimera_check-4b57c3241cbc/test-data/amazon.align_headUT]PK|\Oq-C09I ٯmothur_chimera_check-4b57c3241cbc/test-data/amazon.align_head.count_tableUT]PK|\O/BsB mothur_chimera_check-4b57c3241cbc/test-data/amazon.align_head.listUT]PK|\ON-C Dmothur_chimera_check-4b57c3241cbc/test-data/amazon.align_head.namesUT]PK|\OK ٱmothur_chimera_check-4b57c3241cbc/test-data/amazon.align_head.wang.taxonomyUT]PK|\O!(9C mothur_chimera_check-4b57c3241cbc/test-data/amazon.align_head_shortUT]PK|\OvgO mothur_chimera_check-4b57c3241cbc/test-data/amazon.an.0.03.-.0.05.otu.hierarchyUT]PK|\ODCU*K mothur_chimera_check-4b57c3241cbc/test-data/amazon.an.0.03.pearson.otu.corrUT]PK|\OyG mothur_chimera_check-4b57c3241cbc/test-data/amazon.an.jclass.unique.treUT]PK|\O*c: #mothur_chimera_check-4b57c3241cbc/test-data/amazon.an.listUT]PK|\OM`x < lmothur_chimera_check-4b57c3241cbc/test-data/amazon.an.rabundUT]PK|\OkT?$\= Wmothur_chimera_check-4b57c3241cbc/test-data/amazon.an.rabund2UT]PK|\O~+C>d> mothur_chimera_check-4b57c3241cbc/test-data/amazon.an.relabundUT]PK|\OC\mq < mothur_chimera_check-4b57c3241cbc/test-data/amazon.an.sabundUT]PK|\OC\mq = mothur_chimera_check-4b57c3241cbc/test-data/amazon.an.sabund2UT]PK|\O~|+ != cmothur_chimera_check-4b57c3241cbc/test-data/amazon.an.sabund3UT]PK|\OƝ< mothur_chimera_check-4b57c3241cbc/test-data/amazon.an.sharedUT]PK|\O+"7= mothur_chimera_check-4b57c3241cbc/test-data/amazon.bad.accnosUT]PK|\Oe[~> mothur_chimera_check-4b57c3241cbc/test-data/amazon.count_tableUT]PK|\O%r9 mothur_chimera_check-4b57c3241cbc/test-data/amazon.designUT]PK|\O۸[#eV047 mothur_chimera_check-4b57c3241cbc/test-data/amazon.distUT]PK|\OFI668 Umothur_chimera_check-4b57c3241cbc/test-data/amazon.fastaUT]PK|\O}F= Umothur_chimera_check-4b57c3241cbc/test-data/amazon.fasta_headUT]PK|\O&|2B \mothur_chimera_check-4b57c3241cbc/test-data/amazon.fragclust.fastaUT]PK|\O.W8NB mothur_chimera_check-4b57c3241cbc/test-data/amazon.fragclust.namesUT]PK|\O> mothur_chimera_check-4b57c3241cbc/test-data/amazon.groupaccnosUT]PK|\O5[9 Xmothur_chimera_check-4b57c3241cbc/test-data/amazon.groupsUT]PK|\O)P$F= mothur_chimera_check-4b57c3241cbc/test-data/amazon.head.namesUT]PK|\Olt #; 5mothur_chimera_check-4b57c3241cbc/test-data/amazon.metadataUT]PK|\O3dk^@ mothur_chimera_check-4b57c3241cbc/test-data/amazon.mothur.sharedUT]PK|\OHt̆N8 mothur_chimera_check-4b57c3241cbc/test-data/amazon.namesUT]PK|\Oo6o> mothur_chimera_check-4b57c3241cbc/test-data/amazon.otus.accnosUT]PK|\O~nM)?< mothur_chimera_check-4b57c3241cbc/test-data/amazon.pair.distUT]PK|\OnC{i< mothur_chimera_check-4b57c3241cbc/test-data/amazon.pcoa.axesUT]PK|\O'#@ iImothur_chimera_check-4b57c3241cbc/test-data/amazon.pcoa.loadingsUT]PK|\Owɔ&I Lmothur_chimera_check-4b57c3241cbc/test-data/amazon.silva.wang.tax.summaryUT]PK|\OH`C Mmothur_chimera_check-4b57c3241cbc/test-data/amazon.square.pcoa.axesUT]PK|\O+5? kNmothur_chimera_check-4b57c3241cbc/test-data/amazon.unique.fastaUT]PK|\O SN? mothur_chimera_check-4b57c3241cbc/test-data/amazon.unique.namesUT]PK|\OPnG mothur_chimera_check-4b57c3241cbc/test-data/amazon.wang.knn.tax.summaryUT]PK|\O]v'eo 0E omothur_chimera_check-4b57c3241cbc/test-data/amazon.wang.wang.taxonomyUT]PK|\O6? Zmothur_chimera_check-4b57c3241cbc/test-data/amazon1.count_tableUT]PK|\O,s\9 Ðmothur_chimera_check-4b57c3241cbc/test-data/amazon1.namesUT]PK|\Oׄ' I mothur_chimera_check-4b57c3241cbc/test-data/amazon_withgroups.count_tableUT]PK|\OwdQN _mothur_chimera_check-4b57c3241cbc/test-data/amazon_withgroups.redundant.groupsUT]PK|\Oxݡ6Q •mothur_chimera_check-4b57c3241cbc/test-data/amazon_withgroups_pasture.count_tableUT]PK|\OЭbI< mothur_chimera_check-4b57c3241cbc/test-data/biosample.sourceUT]PK|\O.E 9 /mothur_chimera_check-4b57c3241cbc/test-data/biosample.tsvUT]PK|\OC9 0mothur_chimera_check-4b57c3241cbc/test-data/biosample.xmlUT]PK|\OYrN!@ mothur_chimera_check-4b57c3241cbc/test-data/cd-test.constaxonomyUT]PK|\O O2Os? ٧mothur_chimera_check-4b57c3241cbc/test-data/cd-test.count_tableUT]PK|\O^ < mothur_chimera_check-4b57c3241cbc/test-data/cd-test.databaseUT]PK|\OI3p8 ƪmothur_chimera_check-4b57c3241cbc/test-data/cd-test.listUT]PK|\O=;F8 < mothur_chimera_check-4b57c3241cbc/test-data/cd-test.repfastaUT]PK|\Om5O; ^mothur_chimera_check-4b57c3241cbc/test-data/cd-test.repnameUT]PKnn=<