65.2 KB
/srv/reproducible-results/rbuild-debian/r-b-build.8UoZwaCc/b1/mercurial-evolve_10.5.3-4_i386.changes vs.
/srv/reproducible-results/rbuild-debian/r-b-build.8UoZwaCc/b2/mercurial-evolve_10.5.3-4_i386.changes
206 B
Files
    
Offset 1, 2 lines modifiedOffset 1, 2 lines modified
  
1 ·2ce700c0121afe39c884923b6f1b6620·481300·vcs·optional·mercurial-evolve_10.5.3-4_all.deb1 ·3871552a2f0642d4d3ae8f2cf33a353e·482256·vcs·optional·mercurial-evolve_10.5.3-4_all.deb
64.8 KB
mercurial-evolve_10.5.3-4_all.deb
367 B
file list
    
Offset 1, 3 lines modifiedOffset 1, 3 lines modified
1 -rw-r--r--···0········0········0········4·2023-02-07·13:16:54.000000·debian-binary1 -rw-r--r--···0········0········0········4·2023-02-07·13:16:54.000000·debian-binary
2 -rw-r--r--···0········0········0·····4136·2023-02-07·13:16:54.000000·control.tar.xz2 -rw-r--r--···0········0········0·····4136·2023-02-07·13:16:54.000000·control.tar.xz
3 -rw-r--r--···0········0········0···476972·2023-02-07·13:16:54.000000·data.tar.xz3 -rw-r--r--···0········0········0···477928·2023-02-07·13:16:54.000000·data.tar.xz
636 B
control.tar.xz
608 B
control.tar
538 B
./control
    
Offset 1, 12 lines modifiedOffset 1, 12 lines modified
1 Package:·mercurial-evolve1 Package:·mercurial-evolve
2 Version:·10.5.3-42 Version:·10.5.3-4
3 Architecture:·all3 Architecture:·all
4 Maintainer:·Debian·Python·Team·<team+python@tracker.debian.org>4 Maintainer:·Debian·Python·Team·<team+python@tracker.debian.org>
5 Installed-Size:·21015 Installed-Size:·2103
6 Depends:·python3:any,·libjs-sphinxdoc·(>=·5.2),·mercurial·(>=·4.8),·python3-cbor6 Depends:·python3:any,·libjs-sphinxdoc·(>=·5.2),·mercurial·(>=·4.8),·python3-cbor
7 Built-Using:·sphinx·(=·5.3.0-4)7 Built-Using:·sphinx·(=·5.3.0-4)
8 Section:·vcs8 Section:·vcs
9 Priority:·optional9 Priority:·optional
10 Homepage:·https://www.mercurial-scm.org/doc/evolution/10 Homepage:·https://www.mercurial-scm.org/doc/evolution/
11 Description:·evolve·extension·for·Mercurial11 Description:·evolve·extension·for·Mercurial
12 ·This·package·provides·the·experimental·"evolve"·extension·for·the·Mercurial12 ·This·package·provides·the·experimental·"evolve"·extension·for·the·Mercurial
48.0 B
./md5sums
30.0 B
./md5sums
Files differ
63.8 KB
data.tar.xz
63.8 KB
data.tar
3.91 KB
file list
    
Offset 115, 26 lines modifiedOffset 115, 26 lines modified
115 -rw-r--r--···0·root·········(0)·root·········(0)······299·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/graphviz.css115 -rw-r--r--···0·root·········(0)·root·········(0)······299·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/graphviz.css
116 -rw-r--r--···0·root·········(0)·root·········(0)·····6714·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/haiku.css116 -rw-r--r--···0·root·········(0)·root·········(0)·····6714·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/haiku.css
117 -rw-r--r--···0·root·········(0)·root·········(0)·····1728·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/logo-evolve.ico.gz117 -rw-r--r--···0·root·········(0)·root·········(0)·····1728·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/logo-evolve.ico.gz
118 -rw-r--r--···0·root·········(0)·root·········(0)···107444·2022-06-25·10:48:29.000000·./usr/share/doc/mercurial-evolve/html/_static/logo-evolve.svg118 -rw-r--r--···0·root·········(0)·root·········(0)···107444·2022-06-25·10:48:29.000000·./usr/share/doc/mercurial-evolve/html/_static/logo-evolve.svg
119 -rw-r--r--···0·root·········(0)·root·········(0)·······90·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/minus.png119 -rw-r--r--···0·root·········(0)·root·········(0)·······90·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/minus.png
120 -rw-r--r--···0·root·········(0)·root·········(0)·······90·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/plus.png120 -rw-r--r--···0·root·········(0)·root·········(0)·······90·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/plus.png
121 -rw-r--r--···0·root·········(0)·root·········(0)·····4846·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/pygments.css121 -rw-r--r--···0·root·········(0)·root·········(0)·····4846·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/_static/pygments.css
122 -rw-r--r--···0·root·········(0)·root·········(0)····26959·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/commands.html122 -rw-r--r--···0·root·········(0)·root·········(0)····27952·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/commands.html
123 -rw-r--r--···0·root·········(0)·root·········(0)····14285·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/concepts.html123 -rw-r--r--···0·root·········(0)·root·········(0)····14285·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/concepts.html
124 -rw-r--r--···0·root·········(0)·root·········(0)····15013·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/evolve-faq.html124 -rw-r--r--···0·root·········(0)·root·········(0)····15013·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/evolve-faq.html
125 -rw-r--r--···0·root·········(0)·root·········(0)·····4868·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/evolve-good-practice.html125 -rw-r--r--···0·root·········(0)·root·········(0)·····4868·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/evolve-good-practice.html
126 -rw-r--r--···0·root·········(0)·root·········(0)····15194·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/from-mq.html126 -rw-r--r--···0·root·········(0)·root·········(0)····15194·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/from-mq.html
127 -rw-r--r--···0·root·········(0)·root·········(0)·····1919·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/genindex.html127 -rw-r--r--···0·root·········(0)·root·········(0)·····1919·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/genindex.html
128 -rw-r--r--···0·root·········(0)·root·········(0)····16824·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/index.html128 -rw-r--r--···0·root·········(0)·root·········(0)····16824·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/index.html
129 -rw-r--r--···0·root·········(0)·root·········(0)·····6486·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/known-doc-issues.html129 -rw-r--r--···0·root·········(0)·root·········(0)·····6486·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/known-doc-issues.html
130 -rw-r--r--···0·root·········(0)·root·········(0)······661·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/objects.inv130 -rw-r--r--···0·root·········(0)·root·········(0)······661·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/objects.inv
131 -rw-r--r--···0·root·········(0)·root·········(0)····11974·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/obs-terms.html131 -rw-r--r--···0·root·········(0)·root·········(0)····11974·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/obs-terms.html
132 -rw-r--r--···0·root·········(0)·root·········(0)·····2683·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/search.html132 -rw-r--r--···0·root·········(0)·root·········(0)·····2683·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/search.html
133 -rw-r--r--···0·root·········(0)·root·········(0)····50412·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/searchindex.js133 -rw-r--r--···0·root·········(0)·root·········(0)····51670·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/searchindex.js
134 -rw-r--r--···0·root·········(0)·root·········(0)····54591·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/sharing.html134 -rw-r--r--···0·root·········(0)·root·········(0)····54591·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/sharing.html
135 -rw-r--r--···0·root·········(0)·root·········(0)····34478·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/troubles-handling.html135 -rw-r--r--···0·root·········(0)·root·········(0)····34478·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/troubles-handling.html
136 drwxr-xr-x···0·root·········(0)·root·········(0)········0·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorial/136 drwxr-xr-x···0·root·········(0)·root·········(0)········0·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorial/
137 -rw-r--r--···0·root·········(0)·root·········(0)·····4551·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorial/README.html137 -rw-r--r--···0·root·········(0)·root·········(0)·····4551·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorial/README.html
138 drwxr-xr-x···0·root·········(0)·root·········(0)········0·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorials/138 drwxr-xr-x···0·root·········(0)·root·········(0)········0·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorials/
139 -rw-r--r--···0·root·········(0)·root·········(0)····63260·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorials/topic-tutorial.html139 -rw-r--r--···0·root·········(0)·root·········(0)····63260·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorials/topic-tutorial.html
140 -rw-r--r--···0·root·········(0)·root·········(0)····57269·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorials/tutorial.html140 -rw-r--r--···0·root·········(0)·root·········(0)····57269·2023-02-07·13:16:54.000000·./usr/share/doc/mercurial-evolve/html/tutorials/tutorial.html
42.6 KB
./usr/share/doc/mercurial-evolve/html/commands.html
    
Offset 39, 64 lines modifiedOffset 39, 67 lines modified
39 ······<div·class="content"·role="main">39 ······<div·class="content"·role="main">
40 ········40 ········
41 ········41 ········
42 ··<section·id="evolve-commands-reference">42 ··<section·id="evolve-commands-reference">
43 <h1>Evolve·Commands·Reference<a·class="headerlink"·href="#evolve-commands-reference"·title="Permalink·to·this·heading">¶</a></h1>43 <h1>Evolve·Commands·Reference<a·class="headerlink"·href="#evolve-commands-reference"·title="Permalink·to·this·heading">¶</a></h1>
44 <section·id="amend">44 <section·id="amend">
45 <h2>amend<a·class="headerlink"·href="#amend"·title="Permalink·to·this·heading">¶</a></h2>45 <h2>amend<a·class="headerlink"·href="#amend"·title="Permalink·to·this·heading">¶</a></h2>
46 <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·amend·[OPTION]...·[FILE]...46 <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·amend·[OPTION]...·[DATEI]...
  
47 aliases:·refresh47 Aliase:·refresh
  
48 combine·a·changeset·with·updates·and·replace·it·with·a·new·one48 combine·a·changeset·with·updates·and·replace·it·with·a·new·one
  
49 ····Commits·a·new·changeset·incorporating·both·the·changes·to·the·given·files49 ····Commits·a·new·changeset·incorporating·both·the·changes·to·the·given·files
50 ····and·all·the·changes·from·the·current·parent·changeset·into·the·repository.50 ····and·all·the·changes·from·the·current·parent·changeset·into·the·repository.
  
51 ····See·&#39;hg·commit&#39;·for·details·about·committing·changes.51 ····See·&#39;hg·commit&#39;·for·details·about·committing·changes.
  
52 ····If·you·don&#39;t·specify·-m,·the·parent&#39;s·message·will·be·reused.52 ····If·you·don&#39;t·specify·-m,·the·parent&#39;s·message·will·be·reused.
  
53 ····If·--extract·is·specified,·the·behavior·of·&#39;hg·amend&#39;·is·reversed:·Changes53 ····If·--extract·is·specified,·the·behavior·of·&#39;hg·amend&#39;·is·reversed:·Changes
54 ····to·selected·files·in·the·checked·out·revision·appear·again·as·uncommitted54 ····to·selected·files·in·the·checked·out·revision·appear·again·as·uncommitted
55 ····changed·in·the·working·directory.55 ····changed·in·the·working·directory.
  
56 ····Returns·0·on·success,·1·if·nothing·changed.56 ····Gibt·0·bei·Erfolg·zurück,·wenn·nichts·geändert·wurde.
  
57 options·([+]·can·be·repeated):57 options·([+]·can·be·repeated):
  
58 ·-A·--addremove···········mark·new/missing·files·as·added/removed·before 
59 ··························committing58 ·-A·--addremove···········Markiert·neue/fehlende·Dateien·als
 59 ··························hinzugefügt/entfernt
60 ·-a·--all·················match·all·files60 ·-a·--all·················match·all·files
61 ·-e·--edit················invoke·editor·on·commit·messages61 ·-e·--edit················Ruft·Editor·zum·Setzen·der·Versionsmeldung·auf
62 ····--extract·············extract·changes·from·the·commit·to·the·working·copy62 ····--extract·············extract·changes·from·the·commit·to·the·working·copy
63 ····--patch···············make·changes·to·wdir·parent·by·editing·patch63 ····--patch···············make·changes·to·wdir·parent·by·editing·patch
64 ····--close-branch········mark·a·branch·as·closed,·hiding·it·from·the·branch 
65 ··························list 
66 ·-s·--secret··············use·the·secret·phase·for·committing64 ····--close-branch········Markiert·einen·Branch·als·geschlossen·und·blendet
 65 ··························ihn·in·der·Branchlist·aus
 66 ·-s·--secret··············Beim·Übernehmen·die·gemeine·Phase·(secret)·benutzen
67 ·-n·--note·TEXT···········store·a·note·on·amend67 ·-n·--note·TEXT···········store·a·note·on·amend
68 ·-I·--include·PATTERN·[+]·include·names·matching·the·given·patterns 
69 ·-X·--exclude·PATTERN·[+]·exclude·names·matching·the·given·patterns68 ·-I·--include·PATTERN·[+]·Namen·hinzufügen,·die·auf·das·angegebene·Muster
 69 ··························passen
 70 ·-X·--exclude·PATTERN·[+]·Namen·ausschließen,·die·auf·das·angegebene·Muster
 71 ··························passen
70 ·-m·--message·TEXT········use·text·as·commit·message72 ·-m·--message·TEXT········Nutzt·Text·als·Commit-Nachricht
71 ·-l·--logfile·FILE········read·commit·message·from·file 
72 ·-d·--date·DATE···········record·the·specified·date·as·commit·date 
73 ·-u·--user·USER···········record·the·specified·user·as·committer 
74 ·-D·--current-date········record·the·current·date·as·commit·date 
75 ·-U·--current-user········record·the·current·user·as·committer73 ·-l·--logfile·DATEI·······Liest·Commit-Nachricht·aus·Datei
 74 ·-d·--date·DATUM··········Protokolliert·das·angegebenen·Datum·als
 75 ··························Übernahmedatum
 76 ·-u·--user·BENUTZER·······Protokolliert·den·angegebenen·Nutzer·als·Autor
 77 ·-D·--current-date········Protokolliert·das·aktuelle·Datum·als·Commit-Datum
 78 ·-U·--current-user········Protokolliert·den·aktuellen·Nutzer·als·Autor
76 ·-i·--interactive·········use·interactive·mode79 ·-i·--interactive·········use·interactive·mode
  
77 (some·details·hidden,·use·--verbose·to·show·complete·help)80 (some·details·hidden,·use·--verbose·to·show·complete·help)
78 </pre></div>81 </pre></div>
79 </div>82 </div>
80 </section>83 </section>
81 <section·id="evolve">84 <section·id="evolve">
82 <h2>evolve<a·class="headerlink"·href="#evolve"·title="Permalink·to·this·heading">¶</a></h2>85 <h2>evolve<a·class="headerlink"·href="#evolve"·title="Permalink·to·this·heading">¶</a></h2>
83 <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·evolve·[OPTIONS]...86 <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·evolve·[OPTIONS]...
  
84 aliases:·stabilize,·solve87 Aliase:·stabilize,·solve
  
85 solve·troubled·changesets·in·your·repository88 solve·troubled·changesets·in·your·repository
  
86 ····Modifying·history·can·lead·to·various·types·of·troubled·changesets:89 ····Modifying·history·can·lead·to·various·types·of·troubled·changesets:
87 ····orphan,·phase-divergent,·or·content-divergent.·The·evolve·command·resolves90 ····orphan,·phase-divergent,·or·content-divergent.·The·evolve·command·resolves
88 ····your·troubles·by·executing·one·of·the·following·actions:91 ····your·troubles·by·executing·one·of·the·following·actions:
  
Offset 196, 47 lines modifiedOffset 199, 47 lines modified
196 ·-a·--all···············evolve·all·troubled·changesets·related·to·the·current199 ·-a·--all···············evolve·all·troubled·changesets·related·to·the·current
197 ························working·directory·and·its·descendants·(default)200 ························working·directory·and·its·descendants·(default)
198 ····--update············update·to·the·head·of·evolved·changesets201 ····--update············update·to·the·head·of·evolved·changesets
199 ·-c·--continue··········continue·an·interrupted·evolution202 ·-c·--continue··········continue·an·interrupted·evolution
200 ····--stop··············stop·the·interrupted·evolution203 ····--stop··············stop·the·interrupted·evolution
201 ····--abort·············abort·the·interrupted·evolution204 ····--abort·············abort·the·interrupted·evolution
202 ·-l·--list··············provide·details·on·troubled·changesets·in·the·repo205 ·-l·--list··············provide·details·on·troubled·changesets·in·the·repo
203 ·-t·--tool·TOOL·········specify·merge·tool206 ·-t·--tool·TOOL·········Methode·für·das·Zusammenführen
  
204 (some·details·hidden,·use·--verbose·to·show·complete·help)207 (some·details·hidden,·use·--verbose·to·show·complete·help)
205 </pre></div>208 </pre></div>
206 </div>209 </div>
207 </section>210 </section>
208 <section·id="fold">211 <section·id="fold">
209 <h2>fold<a·class="headerlink"·href="#fold"·title="Permalink·to·this·heading">¶</a></h2>212 <h2>fold<a·class="headerlink"·href="#fold"·title="Permalink·to·this·heading">¶</a></h2>
210 <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·fold·[OPTION]...·[-r]·REV...213 <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·fold·[OPTION]...·[-r]·REV...
  
211 aliases:·squash214 Aliase:·squash
  
212 fold·multiple·revisions·into·a·single·one215 fold·multiple·revisions·into·a·single·one
  
213 ····With·--from,·folds·all·the·revisions·linearly·between·the·given·revisions216 ····With·--from,·folds·all·the·revisions·linearly·between·the·given·revisions
214 ····and·the·parent·of·the·working·directory.217 ····and·the·parent·of·the·working·directory.
  
215 ····With·--exact,·folds·only·the·specified·revisions·while·ignoring·the·parent218 ····With·--exact,·folds·only·the·specified·revisions·while·ignoring·the·parent
216 ····of·the·working·directory.·In·this·case,·the·given·revisions·must·form·a219 ····of·the·working·directory.·In·this·case,·the·given·revisions·must·form·a
217 ····linear·unbroken·chain.220 ····linear·unbroken·chain.
  
218 options·([+]·can·be·repeated):221 options·([+]·can·be·repeated):
  
219 ·-r·--rev·REV·[+]··revision·to·fold222 ·-r·--rev·REV·[+]···revision·to·fold
220 ····--exact········only·fold·specified·revisions223 ····--exact·········only·fold·specified·revisions
221 ····--from·········fold·revisions·linearly·to·working·copy·parent224 ····--from··········fold·revisions·linearly·to·working·copy·parent
222 ·-n·--note·TEXT····store·a·note·on·fold225 ·-n·--note·TEXT·····store·a·note·on·fold
223 ·-m·--message·TEXT·use·text·as·commit·message 
224 ·-l·--logfile·FILE·read·commit·message·from·file 
225 ·-d·--date·DATE····record·the·specified·date·as·commit·date 
226 ·-u·--user·USER····record·the·specified·user·as·committer 
227 ·-D·--current-date·record·the·current·date·as·commit·date 
228 ·-U·--current-user·record·the·current·user·as·committer226 ·-m·--message·TEXT··Nutzt·Text·als·Commit-Nachricht
 227 ·-l·--logfile·DATEI·Liest·Commit-Nachricht·aus·Datei
 228 ·-d·--date·DATUM····Protokolliert·das·angegebenen·Datum·als·Übernahmedatum
 229 ·-u·--user·BENUTZER·Protokolliert·den·angegebenen·Nutzer·als·Autor
 230 ·-D·--current-date··Protokolliert·das·aktuelle·Datum·als·Commit-Datum
 231 ·-U·--current-user··Protokolliert·den·aktuellen·Nutzer·als·Autor
  
229 (some·details·hidden,·use·--verbose·to·show·complete·help)232 (some·details·hidden,·use·--verbose·to·show·complete·help)
230 </pre></div>233 </pre></div>
231 </div>234 </div>
232 </section>235 </section>
233 <section·id="metaedit">236 <section·id="metaedit">
Max diff block lines reached; 15529/22412 bytes (69.29%) of diff not shown.
20.6 KB
html2text {}
    
Offset 8, 61 lines modifiedOffset 8, 64 lines modified
  
8 ******·evolve_extension_for_Mercurial·******8 ******·evolve_extension_for_Mercurial·******
9 *****·Evolve·Commands·Reference·*****9 *****·Evolve·Commands·Reference·*****
10 «  From_MQ_To_Evolve,_The_Refugee_Book·  ::  ·Contents·  ::  ·Known10 «  From_MQ_To_Evolve,_The_Refugee_Book·  ::  ·Contents·  ::  ·Known
11 limitations_of_the_current_documentation  Â»11 limitations_of_the_current_documentation  Â»
12 ******·Evolve·Commands·Reference¶·******12 ******·Evolve·Commands·Reference¶·******
13 *****·amend¶·*****13 *****·amend¶·*****
14 hg·amend·[OPTION]...·[FILE]...14 hg·amend·[OPTION]...·[DATEI]...
  
15 aliases:·refresh15 Aliase:·refresh
  
16 combine·a·changeset·with·updates·and·replace·it·with·a·new·one16 combine·a·changeset·with·updates·and·replace·it·with·a·new·one
  
17 ····Commits·a·new·changeset·incorporating·both·the·changes·to·the·given·files17 ····Commits·a·new·changeset·incorporating·both·the·changes·to·the·given·files
18 ····and·all·the·changes·from·the·current·parent·changeset·into·the·repository.18 ····and·all·the·changes·from·the·current·parent·changeset·into·the·repository.
  
19 ····See·'hg·commit'·for·details·about·committing·changes.19 ····See·'hg·commit'·for·details·about·committing·changes.
  
20 ····If·you·don't·specify·-m,·the·parent's·message·will·be·reused.20 ····If·you·don't·specify·-m,·the·parent's·message·will·be·reused.
  
21 ····If·--extract·is·specified,·the·behavior·of·'hg·amend'·is·reversed:·Changes21 ····If·--extract·is·specified,·the·behavior·of·'hg·amend'·is·reversed:·Changes
22 ····to·selected·files·in·the·checked·out·revision·appear·again·as·uncommitted22 ····to·selected·files·in·the·checked·out·revision·appear·again·as·uncommitted
23 ····changed·in·the·working·directory.23 ····changed·in·the·working·directory.
  
24 ····Returns·0·on·success,·1·if·nothing·changed.24 ····Gibt·0·bei·Erfolg·zurück,·wenn·nichts·geändert·wurde.
  
25 options·([+]·can·be·repeated):25 options·([+]·can·be·repeated):
  
26 ·-A·--addremove···········mark·new/missing·files·as·added/removed·before 
27 ··························committing26 ·-A·--addremove···········Markiert·neue/fehlende·Dateien·als
 27 ··························hinzugefügt/entfernt
28 ·-a·--all·················match·all·files28 ·-a·--all·················match·all·files
29 ·-e·--edit················invoke·editor·on·commit·messages29 ·-e·--edit················Ruft·Editor·zum·Setzen·der·Versionsmeldung·auf
30 ····--extract·············extract·changes·from·the·commit·to·the·working·copy30 ····--extract·············extract·changes·from·the·commit·to·the·working·copy
31 ····--patch···············make·changes·to·wdir·parent·by·editing·patch31 ····--patch···············make·changes·to·wdir·parent·by·editing·patch
32 ····--close-branch········mark·a·branch·as·closed,·hiding·it·from·the·branch 
33 ··························list 
34 ·-s·--secret··············use·the·secret·phase·for·committing32 ····--close-branch········Markiert·einen·Branch·als·geschlossen·und·blendet
 33 ··························ihn·in·der·Branchlist·aus
 34 ·-s·--secret··············Beim·Ãœbernehmen·die·gemeine·Phase·(secret)·benutzen
35 ·-n·--note·TEXT···········store·a·note·on·amend35 ·-n·--note·TEXT···········store·a·note·on·amend
36 ·-I·--include·PATTERN·[+]·include·names·matching·the·given·patterns 
37 ·-X·--exclude·PATTERN·[+]·exclude·names·matching·the·given·patterns36 ·-I·--include·PATTERN·[+]·Namen·hinzu¼gen,·die·auf·das·angegebene·Muster
 37 ··························passen
 38 ·-X·--exclude·PATTERN·[+]·Namen·ausschließen,·die·auf·das·angegebene·Muster
 39 ··························passen
38 ·-m·--message·TEXT········use·text·as·commit·message40 ·-m·--message·TEXT········Nutzt·Text·als·Commit-Nachricht
39 ·-l·--logfile·FILE········read·commit·message·from·file 
40 ·-d·--date·DATE···········record·the·specified·date·as·commit·date 
41 ·-u·--user·USER···········record·the·specified·user·as·committer 
42 ·-D·--current-date········record·the·current·date·as·commit·date 
43 ·-U·--current-user········record·the·current·user·as·committer41 ·-l·--logfile·DATEI·······Liest·Commit-Nachricht·aus·Datei
 42 ·-d·--date·DATUM··········Protokolliert·das·angegebenen·Datum·als
 43 ··························Ãœbernahmedatum
 44 ·-u·--user·BENUTZER·······Protokolliert·den·angegebenen·Nutzer·als·Autor
 45 ·-D·--current-date········Protokolliert·das·aktuelle·Datum·als·Commit-Datum
 46 ·-U·--current-user········Protokolliert·den·aktuellen·Nutzer·als·Autor
44 ·-i·--interactive·········use·interactive·mode47 ·-i·--interactive·········use·interactive·mode
  
45 (some·details·hidden,·use·--verbose·to·show·complete·help)48 (some·details·hidden,·use·--verbose·to·show·complete·help)
  
46 *****·evolve¶·*****49 *****·evolve¶·*****
47 hg·evolve·[OPTIONS]...50 hg·evolve·[OPTIONS]...
  
48 aliases:·stabilize,·solve51 Aliase:·stabilize,·solve
  
49 solve·troubled·changesets·in·your·repository52 solve·troubled·changesets·in·your·repository
  
50 ····Modifying·history·can·lead·to·various·types·of·troubled·changesets:53 ····Modifying·history·can·lead·to·various·types·of·troubled·changesets:
51 ····orphan,·phase-divergent,·or·content-divergent.·The·evolve·command·resolves54 ····orphan,·phase-divergent,·or·content-divergent.·The·evolve·command·resolves
52 ····your·troubles·by·executing·one·of·the·following·actions:55 ····your·troubles·by·executing·one·of·the·following·actions:
  
Offset 162, 44 lines modifiedOffset 165, 44 lines modified
162 ·-a·--all···············evolve·all·troubled·changesets·related·to·the·current165 ·-a·--all···············evolve·all·troubled·changesets·related·to·the·current
163 ························working·directory·and·its·descendants·(default)166 ························working·directory·and·its·descendants·(default)
164 ····--update············update·to·the·head·of·evolved·changesets167 ····--update············update·to·the·head·of·evolved·changesets
165 ·-c·--continue··········continue·an·interrupted·evolution168 ·-c·--continue··········continue·an·interrupted·evolution
166 ····--stop··············stop·the·interrupted·evolution169 ····--stop··············stop·the·interrupted·evolution
167 ····--abort·············abort·the·interrupted·evolution170 ····--abort·············abort·the·interrupted·evolution
168 ·-l·--list··············provide·details·on·troubled·changesets·in·the·repo171 ·-l·--list··············provide·details·on·troubled·changesets·in·the·repo
169 ·-t·--tool·TOOL·········specify·merge·tool172 ·-t·--tool·TOOL·········Methode·für·das·Zusammenführen
  
170 (some·details·hidden,·use·--verbose·to·show·complete·help)173 (some·details·hidden,·use·--verbose·to·show·complete·help)
  
171 *****·fold¶·*****174 *****·fold¶·*****
172 hg·fold·[OPTION]...·[-r]·REV...175 hg·fold·[OPTION]...·[-r]·REV...
  
173 aliases:·squash176 Aliase:·squash
  
174 fold·multiple·revisions·into·a·single·one177 fold·multiple·revisions·into·a·single·one
  
175 ····With·--from,·folds·all·the·revisions·linearly·between·the·given·revisions178 ····With·--from,·folds·all·the·revisions·linearly·between·the·given·revisions
176 ····and·the·parent·of·the·working·directory.179 ····and·the·parent·of·the·working·directory.
  
177 ····With·--exact,·folds·only·the·specified·revisions·while·ignoring·the·parent180 ····With·--exact,·folds·only·the·specified·revisions·while·ignoring·the·parent
178 ····of·the·working·directory.·In·this·case,·the·given·revisions·must·form·a181 ····of·the·working·directory.·In·this·case,·the·given·revisions·must·form·a
179 ····linear·unbroken·chain.182 ····linear·unbroken·chain.
  
180 options·([+]·can·be·repeated):183 options·([+]·can·be·repeated):
  
181 ·-r·--rev·REV·[+]··revision·to·fold184 ·-r·--rev·REV·[+]···revision·to·fold
182 ····--exact········only·fold·specified·revisions185 ····--exact·········only·fold·specified·revisions
183 ····--from·········fold·revisions·linearly·to·working·copy·parent186 ····--from··········fold·revisions·linearly·to·working·copy·parent
184 ·-n·--note·TEXT····store·a·note·on·fold187 ·-n·--note·TEXT·····store·a·note·on·fold
185 ·-m·--message·TEXT·use·text·as·commit·message 
186 ·-l·--logfile·FILE·read·commit·message·from·file 
187 ·-d·--date·DATE····record·the·specified·date·as·commit·date 
188 ·-u·--user·USER····record·the·specified·user·as·committer 
189 ·-D·--current-date·record·the·current·date·as·commit·date 
190 ·-U·--current-user·record·the·current·user·as·committer188 ·-m·--message·TEXT··Nutzt·Text·als·Commit-Nachricht
 189 ·-l·--logfile·DATEI·Liest·Commit-Nachricht·aus·Datei
 190 ·-d·--date·DATUM····Protokolliert·das·angegebenen·Datum·als·Ãœbernahmedatum
 191 ·-u·--user·BENUTZER·Protokolliert·den·angegebenen·Nutzer·als·Autor
 192 ·-D·--current-date··Protokolliert·das·aktuelle·Datum·als·Commit-Datum
 193 ·-U·--current-user··Protokolliert·den·aktuellen·Nutzer·als·Autor
  
191 (some·details·hidden,·use·--verbose·to·show·complete·help)194 (some·details·hidden,·use·--verbose·to·show·complete·help)
  
192 *****·metaedit¶·*****195 *****·metaedit¶·*****
193 hg·metaedit·[OPTION]...·[[-r]·REV]...196 hg·metaedit·[OPTION]...·[[-r]·REV]...
  
194 edit·commit·information197 edit·commit·information
Offset 208, 23 lines modifiedOffset 211, 23 lines modified
208 ····edits·commit·information·for·the·working·directory·parent.211 ····edits·commit·information·for·the·working·directory·parent.
  
209 ····With·--fold,·also·folds·multiple·revisions·into·one·if·necessary.·In·this212 ····With·--fold,·also·folds·multiple·revisions·into·one·if·necessary.·In·this
210 ····case,·the·given·revisions·must·form·a·linear·unbroken·chain.213 ····case,·the·given·revisions·must·form·a·linear·unbroken·chain.
Max diff block lines reached; 14720/21104 bytes (69.75%) of diff not shown.
17.2 KB
./usr/share/doc/mercurial-evolve/html/searchindex.js
17.1 KB
js-beautify {}
    
Offset 1, 28 lines modifiedOffset 1, 29 lines modified
1 Search.setIndex({1 Search.setIndex({
2 ····"docnames":·["commands",·"concepts",·"evolve-faq",·"evolve-good-practice",·"from-mq",·"index",·"known-doc-issues",·"obs-terms",·"sharing",·"troubles-handling",·"tutorial/README",·"tutorials/topic-tutorial",·"tutorials/tutorial",·"user-guide"],2 ····"docnames":·["commands",·"concepts",·"evolve-faq",·"evolve-good-practice",·"from-mq",·"index",·"known-doc-issues",·"obs-terms",·"sharing",·"troubles-handling",·"tutorial/README",·"tutorials/topic-tutorial",·"tutorials/tutorial",·"user-guide"],
3 ····"filenames":·["commands.rst",·"concepts.rst",·"evolve-faq.rst",·"evolve-good-practice.rst",·"from-mq.rst",·"index.rst",·"known-doc-issues.rst",·"obs-terms.rst",·"sharing.rst",·"troubles-handling.rst",·"tutorial/README.rst",·"tutorials/topic-tutorial.rst",·"tutorials/tutorial.rst",·"user-guide.rst"],3 ····"filenames":·["commands.rst",·"concepts.rst",·"evolve-faq.rst",·"evolve-good-practice.rst",·"from-mq.rst",·"index.rst",·"known-doc-issues.rst",·"obs-terms.rst",·"sharing.rst",·"troubles-handling.rst",·"tutorial/README.rst",·"tutorials/topic-tutorial.rst",·"tutorials/tutorial.rst",·"user-guide.rst"],
4 ····"titles":·["Evolve·Commands·Reference",·"Evolve:·Concepts",·"Evolve·How·To",·"Good·practice·for·(early)·users·of·evolve",·"From·MQ·To·Evolve,·The·Refugee·Book",·"Changeset·Evolution·with·Mercurial",·"Known·limitations·of·the·current·documentation",·"Terminology·of·the·obsolete·concept",·"Evolve:·Shared·Mutable·History",·"Possible·troubles·in·rewriting·history·and·their·resolution",·"Training·supports",·"Topic·Tutorial",·"Initial·setup",·"Evolve:·User·Guide"],4 ····"titles":·["Evolve·Commands·Reference",·"Evolve:·Concepts",·"Evolve·How·To",·"Good·practice·for·(early)·users·of·evolve",·"From·MQ·To·Evolve,·The·Refugee·Book",·"Changeset·Evolution·with·Mercurial",·"Known·limitations·of·the·current·documentation",·"Terminology·of·the·obsolete·concept",·"Evolve:·Shared·Mutable·History",·"Possible·troubles·in·rewriting·history·and·their·resolution",·"Training·supports",·"Topic·Tutorial",·"Initial·setup",·"Evolve:·User·Guide"],
5 ····"terms":·{5 ····"terms":·{
6 ········"hg":·[0,·1,·2,·5,·6,·7,·8,·11,·13],6 ········"hg":·[0,·1,·2,·5,·6,·7,·8,·11,·13],
7 ········"option":·[0,·4,·8,·11,·12,·13],7 ········"option":·[0,·4,·8,·11,·12,·13],
8 ········"file":·[0,·5,·7,·8,·10,·11,·12],8 ········"datei":·0,
9 ········"alias":·[0,·2,·12],9 ········"alias":·[0,·2,·12],
10 ········"refresh":·0,10 ········"refresh":·0,
11 ········"combin":·[0,·2,·7,·13],11 ········"combin":·[0,·2,·7,·13],
12 ········"changeset":·[0,·4,·6,·11],12 ········"changeset":·[0,·4,·6,·11],
13 ········"updat":·[0,·4,·5,·8,·11,·12,·13],13 ········"updat":·[0,·4,·5,·8,·11,·12,·13],
14 ········"replac":·[0,·1,·2,·5,·7,·8,·10,·12,·13],14 ········"replac":·[0,·1,·2,·5,·7,·8,·10,·12,·13],
15 ········"new":·[0,·1,·2,·4,·5,·7,·9,·11,·12],15 ········"new":·[0,·1,·2,·4,·5,·7,·9,·11,·12],
16 ········"one":·[0,·1,·2,·5,·7,·8,·11,·12],16 ········"one":·[0,·1,·2,·5,·7,·8,·11,·12],
17 ········"commit":·[0,·1,·4,·5,·7,·11,·12],17 ········"commit":·[0,·1,·4,·5,·7,·11,·12],
18 ········"incorpor":·0,18 ········"incorpor":·0,
19 ········"both":·[0,·1,·4,·8,·12,·13],19 ········"both":·[0,·1,·4,·8,·12,·13],
20 ········"chang":·[0,·1,·4,·5,·6,·7,·8,·11],20 ········"chang":·[0,·1,·4,·5,·6,·7,·8,·11],
21 ········"given":·[0,·2,·12],21 ········"given":·[0,·2,·12],
 22 ········"file":·[0,·5,·7,·8,·10,·11,·12],
22 ········"all":·[0,·1,·2,·3,·4,·7,·8,·10,·11,·12,·13],23 ········"all":·[0,·1,·2,·3,·4,·7,·8,·10,·11,·12,·13],
23 ········"from":·[0,·1,·3,·5,·7,·8,·9,·11,·12],24 ········"from":·[0,·1,·3,·5,·7,·8,·9,·11,·12],
24 ········"current":·[0,·4,·5,·9,·10,·11,·12,·13],25 ········"current":·[0,·4,·5,·9,·10,·11,·12,·13],
25 ········"parent":·[0,·1,·2,·4,·7,·11,·12,·13],26 ········"parent":·[0,·1,·2,·4,·7,·11,·12,·13],
26 ········"repositori":·[0,·1,·5,·9,·11,·12,·13],27 ········"repositori":·[0,·1,·5,·9,·11,·12,·13],
27 ········"see":·[0,·4,·5,·8,·9,·10,·11,·12,·13],28 ········"see":·[0,·4,·5,·8,·9,·10,·11,·12,·13],
28 ········"detail":·[0,·5,·6,·8,·11,·12,·13],29 ········"detail":·[0,·5,·6,·8,·11,·12,·13],
Offset 44, 63 lines modifiedOffset 45, 100 lines modified
44 ········"check":·[0,·6,·9,·12],45 ········"check":·[0,·6,·9,·12],
45 ········"out":·[0,·1,·4,·8,·11,·12],46 ········"out":·[0,·1,·4,·8,·11,·12],
46 ········"revis":·[0,·8,·11,·12],47 ········"revis":·[0,·8,·11,·12],
47 ········"appear":·[0,·2,·7,·9,·12,·13],48 ········"appear":·[0,·2,·7,·9,·12,·13],
48 ········"again":·[0,·2,·11,·12,·13],49 ········"again":·[0,·2,·11,·12,·13],
49 ········"work":·[0,·1,·3,·4,·5,·7,·8,·12,·13],50 ········"work":·[0,·1,·3,·4,·5,·7,·8,·12,·13],
50 ········"directori":·[0,·2,·4,·7,·8,·10,·11,·12,·13],51 ········"directori":·[0,·2,·4,·7,·8,·10,·11,·12,·13],
51 ········"return":·[0,·12],52 ········"gibt":·0,
52 ········"0":·[0,·1,·8,·11,·12,·13],53 ········"0":·[0,·1,·8,·11,·12,·13],
53 ········"success":·0,54 ········"bei":·0,
54 ········"1":·[0,·1,·2,·5,·10,·11,·12], 
55 ········"noth":·[0,·8,·11],55 ········"erfolg":·0,
 56 ········"zur\u00fcck":·0,
 57 ········"wenn":·0,
 58 ········"nicht":·0,
 59 ········"ge\u00e4ndert":·0,
 60 ········"wurd":·0,
56 ········"can":·[0,·1,·2,·4,·5,·6,·7,·8,·9,·10,·11,·12,·13],61 ········"can":·[0,·1,·2,·4,·5,·6,·7,·8,·9,·10,·11,·12,·13],
57 ········"repeat":·[0,·8,·12],62 ········"repeat":·[0,·8,·12],
58 ········"A":·[0,·1,·2,·4,·7,·8,·11,·12],63 ········"A":·[0,·1,·2,·4,·7,·8,·11,·12],
59 ········"addremov":·0,64 ········"addremov":·0,
60 ········"mark":·[0,·1,·4,·5,·11,·13], 
61 ········"miss":·[0,·1], 
62 ········"ad":·[0,·2,·5,·8,·11,·12,·13], 
63 ········"remov":·[0,·2,·4,·5,·6,·7,·8,·11,·13], 
64 ········"befor":·[0,·3,·5,·8,·9,·11,·13],65 ········"markiert":·0,
 66 ········"neue":·0,
 67 ········"fehlend":·0,
 68 ········"dateien":·0,
 69 ········"al":·0,
 70 ········"hinzugef\u00fcgt":·0,
 71 ········"entfernt":·0,
65 ········"match":·[0,·2,·12],72 ········"match":·[0,·2,·12],
66 ········"e":·[0,·1,·4,·6,·8,·9,·11,·12,·13],73 ········"e":·[0,·1,·4,·6,·8,·9,·11,·12,·13],
67 ········"edit":·[0,·4,·5,·8,·12,·13],74 ········"edit":·[0,·4,·5,·8,·12,·13],
68 ········"invok":·[0,·2],75 ········"ruft":·0,
69 ········"editor":·[0,·4,·8,·13],76 ········"editor":·[0,·4,·8,·13],
 77 ········"zum":·0,
 78 ········"setzen":·0,
 79 ········"der":·0,
 80 ········"versionsmeldung":·0,
 81 ········"auf":·0,
70 ········"copi":·[0,·1,·7,·8,·10,·11,·12],82 ········"copi":·[0,·1,·7,·8,·10,·11,·12],
71 ········"patch":·[0,·2,·4,·12,·13],83 ········"patch":·[0,·2,·4,·12,·13],
72 ········"make":·[0,·1,·2,·3,·5,·7,·8,·11,·12,·13],84 ········"make":·[0,·1,·2,·3,·5,·7,·8,·11,·12,·13],
73 ········"wdir":·0,85 ········"wdir":·0,
74 ········"close":·0,86 ········"close":·0,
75 ········"branch":·[0,·4,·7,·8,·11],87 ········"branch":·[0,·4,·7,·8,·11],
76 ········"hide":·0,88 ········"einen":·0,
77 ········"list":·[0,·4,·5,·6,·7,·9,·11,·12],89 ········"geschlossen":·0,
 90 ········"und":·0,
 91 ········"blendet":·0,
 92 ········"ihn":·0,
 93 ········"branchlist":·0,
 94 ········"au":·0,
78 ········"secret":·[0,·1,·2,·4,·7,·12],95 ········"secret":·[0,·1,·2,·4,·7,·12],
79 ········"us":·[0,·1,·2,·3,·4,·5,·6,·7,·8,·9,·10,·11,·12,·13],96 ········"beim":·0,
 97 ········"\u00fcbernehmen":·0,
 98 ········"die":·0,
 99 ········"gemein":·0,
80 ········"phase":·[0,·2,·4,·5,·7,·11,·12,·13],100 ········"phase":·[0,·2,·4,·5,·7,·11,·12,·13],
 101 ········"benutzen":·0,
81 ········"n":·[0,·4,·8,·11,·12,·13],102 ········"n":·[0,·4,·8,·11,·12,·13],
82 ········"note":·[0,·4,·8,·9,·11,·12,·13],103 ········"note":·[0,·4,·8,·9,·11,·12,·13],
83 ········"text":·[0,·8,·9,·12],104 ········"text":·[0,·8,·9,·12],
84 ········"store":·[0,·11,·12],105 ········"store":·[0,·11,·12],
85 ········"includ":·[0,·5,·8,·12],106 ········"includ":·[0,·5,·8,·12],
86 ········"pattern":·[0,·12],107 ········"pattern":·[0,·12],
87 ········"name":·[0,·8,·11,·12,·13],108 ········"namen":·0,
 109 ········"hinzuf\u00fcgen":·0,
 110 ········"da":·0,
 111 ········"angegeben":·0,
 112 ········"muster":·[0,·8],
 113 ········"passen":·0,
88 ········"x":·[0,·1,·8,·9,·11,·12,·13],114 ········"x":·[0,·1,·8,·9,·11,·12,·13],
89 ········"exclud":·[0,·7,·12],115 ········"exclud":·[0,·7,·12],
 116 ········"ausschlie\u00dfen":·0,
 117 ········"nutzt":·0,
 118 ········"nachricht":·0,
90 ········"l":·[0,·10,·12,·13],119 ········"l":·[0,·10,·12,·13],
91 ········"logfil":·[0,·12],120 ········"logfil":·[0,·12],
92 ········"read":·[0,·1,·12],121 ········"liest":·0,
93 ········"d":·[0,·4,·8,·12,·13],122 ········"d":·[0,·4,·8,·12,·13],
94 ········"date":·[0,·5,·8,·11,·12],123 ········"date":·[0,·5,·8,·11,·12],
95 ········"record":·[0,·2,·4,·12,·13],124 ········"datum":·0,
 125 ········"protokolliert":·0,
 126 ········"angegebenen":·0,
 127 ········"\u00fcbernahmedatum":·0,
96 ········"u":·[0,·5,·8,·9,·12,·13],128 ········"u":·[0,·5,·8,·9,·12,·13],
97 ········"user":·[0,·1,·4,·5,·6,·8,·9,·10,·11,·12],129 ········"user":·[0,·1,·4,·5,·6,·8,·9,·10,·11,·12],
98 ········"committ":·[0,·12],130 ········"benutz":·0,
 131 ········"den":·0,
 132 ········"nutzer":·0,
 133 ········"autor":·0,
 134 ········"aktuel":·0,
 135 ········"aktuellen":·0,
99 ········"interact":·[0,·12,·13],136 ········"interact":·[0,·12,·13],
Max diff block lines reached; 11997/17505 bytes (68.53%) of diff not shown.