| Offset 1, 2 lines modified | Offset 1, 2 lines modified | ||
| 1 | · | 1 | ·1360cb49612b4b98991c3e43e6a9d147·487796·vcs·optional·mercurial-evolve_11.1.1-1_all.deb |
| Offset 1, 3 lines modified | Offset 1, 3 lines modified | ||
| 1 | -rw-r--r--···0········0········0········4·2024-02-15·20:59:28.000000·debian-binary | 1 | -rw-r--r--···0········0········0········4·2024-02-15·20:59:28.000000·debian-binary |
| 2 | -rw-r--r--···0········0········0·····4152·2024-02-15·20:59:28.000000·control.tar.xz | 2 | -rw-r--r--···0········0········0·····4152·2024-02-15·20:59:28.000000·control.tar.xz |
| 3 | -rw-r--r--···0········0········0···48 | 3 | -rw-r--r--···0········0········0···483452·2024-02-15·20:59:28.000000·data.tar.xz |
| Offset 1, 12 lines modified | Offset 1, 12 lines modified | ||
| 1 | Package:·mercurial-evolve | 1 | Package:·mercurial-evolve |
| 2 | Version:·11.1.1-1 | 2 | Version:·11.1.1-1 |
| 3 | Architecture:·all | 3 | 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:·212 | 5 | Installed-Size:·2124 |
| 6 | Depends:·python3:any,·libjs-sphinxdoc·(>=·7.2.2),·mercurial·(>=·4.8),·python3-cbor | 6 | Depends:·python3:any,·libjs-sphinxdoc·(>=·7.2.2),·mercurial·(>=·4.8),·python3-cbor |
| 7 | Built-Using:·sphinx·(=·7.2.6-6) | 7 | Built-Using:·sphinx·(=·7.2.6-6) |
| 8 | Section:·vcs | 8 | Section:·vcs |
| 9 | Priority:·optional | 9 | 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·Mercurial | 11 | Description:·evolve·extension·for·Mercurial |
| 12 | ·This·package·provides·the·experimental·"evolve"·extension·for·the·Mercurial | 12 | ·This·package·provides·the·experimental·"evolve"·extension·for·the·Mercurial |
| Offset 116, 26 lines modified | Offset 116, 26 lines modified | ||
| 116 | -rw-r--r--···0·root·········(0)·root·········(0)······299·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/_static/graphviz.css | 116 | -rw-r--r--···0·root·········(0)·root·········(0)······299·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/_static/graphviz.css |
| 117 | -rw-r--r--···0·root·········(0)·root·········(0)·····6714·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/_static/haiku.css | 117 | -rw-r--r--···0·root·········(0)·root·········(0)·····6714·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/_static/haiku.css |
| 118 | -rw-r--r--···0·root·········(0)·root·········(0)·····1728·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/_static/logo-evolve.ico.gz | 118 | -rw-r--r--···0·root·········(0)·root·········(0)·····1728·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/_static/logo-evolve.ico.gz |
| 119 | -rw-r--r--···0·root·········(0)·root·········(0)···107444·2022-07-06·09:37:04.000000·./usr/share/doc/mercurial-evolve/html/_static/logo-evolve.svg | 119 | -rw-r--r--···0·root·········(0)·root·········(0)···107444·2022-07-06·09:37:04.000000·./usr/share/doc/mercurial-evolve/html/_static/logo-evolve.svg |
| 120 | -rw-r--r--···0·root·········(0)·root·········(0)·······90·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/_static/minus.png | 120 | -rw-r--r--···0·root·········(0)·root·········(0)·······90·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/_static/minus.png |
| 121 | -rw-r--r--···0·root·········(0)·root·········(0)·······90·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/_static/plus.png | 121 | -rw-r--r--···0·root·········(0)·root·········(0)·······90·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/_static/plus.png |
| 122 | -rw-r--r--···0·root·········(0)·root·········(0)·····4929·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/_static/pygments.css | 122 | -rw-r--r--···0·root·········(0)·root·········(0)·····4929·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/_static/pygments.css |
| 123 | -rw-r--r--···0·root·········(0)·root·········(0)····2 | 123 | -rw-r--r--···0·root·········(0)·root·········(0)····27735·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/commands.html |
| 124 | -rw-r--r--···0·root·········(0)·root·········(0)····14108·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/concepts.html | 124 | -rw-r--r--···0·root·········(0)·root·········(0)····14108·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/concepts.html |
| 125 | -rw-r--r--···0·root·········(0)·root·········(0)····14789·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/evolve-faq.html | 125 | -rw-r--r--···0·root·········(0)·root·········(0)····14789·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/evolve-faq.html |
| 126 | -rw-r--r--···0·root·········(0)·root·········(0)·····4691·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/evolve-good-practice.html | 126 | -rw-r--r--···0·root·········(0)·root·········(0)·····4691·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/evolve-good-practice.html |
| 127 | -rw-r--r--···0·root·········(0)·root·········(0)····14972·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/from-mq.html | 127 | -rw-r--r--···0·root·········(0)·root·········(0)····14972·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/from-mq.html |
| 128 | -rw-r--r--···0·root·········(0)·root·········(0)·····1785·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/genindex.html | 128 | -rw-r--r--···0·root·········(0)·root·········(0)·····1785·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/genindex.html |
| 129 | -rw-r--r--···0·root·········(0)·root·········(0)····16642·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/index.html | 129 | -rw-r--r--···0·root·········(0)·root·········(0)····16642·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/index.html |
| 130 | -rw-r--r--···0·root·········(0)·root·········(0)·····6324·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/known-doc-issues.html | 130 | -rw-r--r--···0·root·········(0)·root·········(0)·····6324·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/known-doc-issues.html |
| 131 | -rw-r--r--···0·root·········(0)·root·········(0)······661·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/objects.inv | 131 | -rw-r--r--···0·root·········(0)·root·········(0)······661·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/objects.inv |
| 132 | -rw-r--r--···0·root·········(0)·root·········(0)····11782·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/obs-terms.html | 132 | -rw-r--r--···0·root·········(0)·root·········(0)····11782·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/obs-terms.html |
| 133 | -rw-r--r--···0·root·········(0)·root·········(0)·····2549·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/search.html | 133 | -rw-r--r--···0·root·········(0)·root·········(0)·····2549·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/search.html |
| 134 | -rw-r--r--···0·root·········(0)·root·········(0)····5 | 134 | -rw-r--r--···0·root·········(0)·root·········(0)····51670·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/searchindex.js |
| 135 | -rw-r--r--···0·root·········(0)·root·········(0)····54289·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/sharing.html | 135 | -rw-r--r--···0·root·········(0)·root·········(0)····54289·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/sharing.html |
| 136 | -rw-r--r--···0·root·········(0)·root·········(0)····34086·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/troubles-handling.html | 136 | -rw-r--r--···0·root·········(0)·root·········(0)····34086·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/troubles-handling.html |
| 137 | drwxr-xr-x···0·root·········(0)·root·········(0)········0·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/tutorial/ | 137 | drwxr-xr-x···0·root·········(0)·root·········(0)········0·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/tutorial/ |
| 138 | -rw-r--r--···0·root·········(0)·root·········(0)·····4375·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/tutorial/README.html | 138 | -rw-r--r--···0·root·········(0)·root·········(0)·····4375·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/tutorial/README.html |
| 139 | drwxr-xr-x···0·root·········(0)·root·········(0)········0·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/tutorials/ | 139 | drwxr-xr-x···0·root·········(0)·root·········(0)········0·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/tutorials/ |
| 140 | -rw-r--r--···0·root·········(0)·root·········(0)····63060·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/tutorials/topic-tutorial.html | 140 | -rw-r--r--···0·root·········(0)·root·········(0)····63060·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/tutorials/topic-tutorial.html |
| 141 | -rw-r--r--···0·root·········(0)·root·········(0)····57048·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/tutorials/tutorial.html | 141 | -rw-r--r--···0·root·········(0)·root·········(0)····57048·2024-02-15·20:59:28.000000·./usr/share/doc/mercurial-evolve/html/tutorials/tutorial.html |
| Offset 35, 64 lines modified | Offset 35, 67 lines modified | ||
| 35 | ······<div·class="content"·role="main"> | 35 | ······<div·class="content"·role="main"> |
| 36 | ········ | 36 | ········ |
| 37 | ········ | 37 | ········ |
| 38 | ··<section·id="evolve-commands-reference"> | 38 | ··<section·id="evolve-commands-reference"> |
| 39 | <h1>Evolve·Commands·Reference<a·class="headerlink"·href="#evolve-commands-reference"·title="Link·to·this·heading">¶</a></h1> | 39 | <h1>Evolve·Commands·Reference<a·class="headerlink"·href="#evolve-commands-reference"·title="Link·to·this·heading">¶</a></h1> |
| 40 | <section·id="amend"> | 40 | <section·id="amend"> |
| 41 | <h2>amend<a·class="headerlink"·href="#amend"·title="Link·to·this·heading">¶</a></h2> | 41 | <h2>amend<a·class="headerlink"·href="#amend"·title="Link·to·this·heading">¶</a></h2> |
| 42 | <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·amend·[OPTION]...·[ | 42 | <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·amend·[OPTION]...·[DATEI]... |
| 43 | 43 | Aliase:·refresh | |
| 44 | combine·a·changeset·with·updates·and·replace·it·with·a·new·one | 44 | combine·a·changeset·with·updates·and·replace·it·with·a·new·one |
| 45 | ····Commits·a·new·changeset·incorporating·both·the·changes·to·the·given·files | 45 | ····Commits·a·new·changeset·incorporating·both·the·changes·to·the·given·files |
| 46 | ····and·all·the·changes·from·the·current·parent·changeset·into·the·repository. | 46 | ····and·all·the·changes·from·the·current·parent·changeset·into·the·repository. |
| 47 | ····See·'hg·commit'·for·details·about·committing·changes. | 47 | ····See·'hg·commit'·for·details·about·committing·changes. |
| 48 | ····If·you·don't·specify·-m,·the·parent's·message·will·be·reused. | 48 | ····If·you·don't·specify·-m,·the·parent's·message·will·be·reused. |
| 49 | ····If·--extract·is·specified,·the·behavior·of·'hg·amend'·is·reversed:·Changes | 49 | ····If·--extract·is·specified,·the·behavior·of·'hg·amend'·is·reversed:·Changes |
| 50 | ····to·selected·files·in·the·checked·out·revision·appear·again·as·uncommitted | 50 | ····to·selected·files·in·the·checked·out·revision·appear·again·as·uncommitted |
| 51 | ····changed·in·the·working·directory. | 51 | ····changed·in·the·working·directory. |
| 52 | ···· | 52 | ····Gibt·0·bei·Erfolg·zurück,·wenn·nichts·geändert·wurde. |
| 53 | options·([+]·can·be·repeated): | 53 | options·([+]·can·be·repeated): |
| 54 | ·-A·--addremove···········mark·new/missing·files·as·added/removed·before | ||
| 55 | · | 54 | ·-A·--addremove···········Markiert·neue/fehlende·Dateien·als |
| 55 | ··························hinzugefügt/entfernt | ||
| 56 | ·-a·--all·················match·all·files | 56 | ·-a·--all·················match·all·files |
| 57 | ·-e·--edit················ | 57 | ·-e·--edit················Ruft·Editor·zum·Setzen·der·Versionsmeldung·auf |
| 58 | ····--extract·············extract·changes·from·the·commit·to·the·working·copy | 58 | ····--extract·············extract·changes·from·the·commit·to·the·working·copy |
| 59 | ····--patch···············make·changes·to·wdir·parent·by·editing·patch | 59 | ····--patch···············make·changes·to·wdir·parent·by·editing·patch |
| 60 | ····--close-branch········mark·a·branch·as·closed,·hiding·it·from·the·branch | ||
| 61 | ··························list | ||
| 62 | · | 60 | ····--close-branch········Markiert·einen·Branch·als·geschlossen·und·blendet |
| 61 | ··························ihn·in·der·Branchlist·aus | ||
| 62 | ·-s·--secret··············Beim·Übernehmen·die·gemeine·Phase·(secret)·benutzen | ||
| 63 | ·-n·--note·TEXT···········store·a·note·on·amend | 63 | ·-n·--note·TEXT···········store·a·note·on·amend |
| 64 | ·-I·--include·PATTERN·[+]·include·names·matching·the·given·patterns | ||
| 65 | ·- | 64 | ·-I·--include·PATTERN·[+]·Namen·hinzufügen,·die·auf·das·angegebene·Muster |
| 65 | ··························passen | ||
| 66 | ·-X·--exclude·PATTERN·[+]·Namen·ausschließen,·die·auf·das·angegebene·Muster | ||
| 67 | ··························passen | ||
| 66 | ·-m·--message·TEXT········u | 68 | ·-m·--message·TEXT········Nutzt·Text·als·Commit-Nachricht |
| 67 | ·-l·--logfile·FILE········read·commit·message·from·file | ||
| 68 | ·-d·--date·DATE···········record·the·specified·date·as·commit·date | ||
| 69 | ·-u·--user·USER···········record·the·specified·user·as·committer | ||
| 70 | ·-D·--current-date········record·the·current·date·as·commit·date | ||
| 71 | ·- | 69 | ·-l·--logfile·DATEI·······Liest·Commit-Nachricht·aus·Datei |
| 70 | ·-d·--date·DATUM··········Protokolliert·das·angegebenen·Datum·als | ||
| 71 | ··························Übernahmedatum | ||
| 72 | ·-u·--user·BENUTZER·······Protokolliert·den·angegebenen·Nutzer·als·Autor | ||
| 73 | ·-D·--current-date········Protokolliert·das·aktuelle·Datum·als·Commit-Datum | ||
| 74 | ·-U·--current-user········Protokolliert·den·aktuellen·Nutzer·als·Autor | ||
| 72 | ·-i·--interactive·········use·interactive·mode | 75 | ·-i·--interactive·········use·interactive·mode |
| 73 | (some·details·hidden,·use·--verbose·to·show·complete·help) | 76 | (some·details·hidden,·use·--verbose·to·show·complete·help) |
| 74 | </pre></div> | 77 | </pre></div> |
| 75 | </div> | 78 | </div> |
| 76 | </section> | 79 | </section> |
| 77 | <section·id="evolve"> | 80 | <section·id="evolve"> |
| 78 | <h2>evolve<a·class="headerlink"·href="#evolve"·title="Link·to·this·heading">¶</a></h2> | 81 | <h2>evolve<a·class="headerlink"·href="#evolve"·title="Link·to·this·heading">¶</a></h2> |
| 79 | <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·evolve·[OPTIONS]... | 82 | <div·class="highlight-none·notranslate"><div·class="highlight"><pre><span></span>hg·evolve·[OPTIONS]... |
| 80 | 83 | Aliase:·stabilize,·solve | |
| 81 | solve·troubled·changesets·in·your·repository | 84 | solve·troubled·changesets·in·your·repository |
| 82 | ····Modifying·history·can·lead·to·various·types·of·troubled·changesets: | 85 | ····Modifying·history·can·lead·to·various·types·of·troubled·changesets: |
| 83 | ····orphan,·phase-divergent,·or·content-divergent.·The·evolve·command·resolves | 86 | ····orphan,·phase-divergent,·or·content-divergent.·The·evolve·command·resolves |
| 84 | ····your·troubles·by·executing·one·of·the·following·actions: | 87 | ····your·troubles·by·executing·one·of·the·following·actions: |
| Offset 7, 61 lines modified | Offset 7, 64 lines modified | ||
| 7 | ******·evolve_extension_for_Mercurial·****** | 7 | ******·evolve_extension_for_Mercurial·****** |
| 8 | *****·Evolve·Commands·Reference·***** | 8 | *****·Evolve·Commands·Reference·***** |
| 9 | « From_MQ_To_Evolve,_The_Refugee_Book· :: ·Contents· :: ·Known | 9 | « From_MQ_To_Evolve,_The_Refugee_Book· :: ·Contents· :: ·Known |
| 10 | limitations_of_the_current_documentation » | 10 | limitations_of_the_current_documentation » |
| 11 | ******·Evolve·Commands·Reference¶·****** | 11 | ******·Evolve·Commands·Reference¶·****** |
| 12 | *****·amend¶·***** | 12 | *****·amend¶·***** |
| 13 | hg·amend·[OPTION]...·[ | 13 | hg·amend·[OPTION]...·[DATEI]... |
| 14 | 14 | Aliase:·refresh | |
| 15 | combine·a·changeset·with·updates·and·replace·it·with·a·new·one | 15 | combine·a·changeset·with·updates·and·replace·it·with·a·new·one |
| 16 | ····Commits·a·new·changeset·incorporating·both·the·changes·to·the·given·files | 16 | ····Commits·a·new·changeset·incorporating·both·the·changes·to·the·given·files |
| 17 | ····and·all·the·changes·from·the·current·parent·changeset·into·the·repository. | 17 | ····and·all·the·changes·from·the·current·parent·changeset·into·the·repository. |
| 18 | ····See·'hg·commit'·for·details·about·committing·changes. | 18 | ····See·'hg·commit'·for·details·about·committing·changes. |
| 19 | ····If·you·don't·specify·-m,·the·parent's·message·will·be·reused. | 19 | ····If·you·don't·specify·-m,·the·parent's·message·will·be·reused. |
| 20 | ····If·--extract·is·specified,·the·behavior·of·'hg·amend'·is·reversed:·Changes | 20 | ····If·--extract·is·specified,·the·behavior·of·'hg·amend'·is·reversed:·Changes |
| 21 | ····to·selected·files·in·the·checked·out·revision·appear·again·as·uncommitted | 21 | ····to·selected·files·in·the·checked·out·revision·appear·again·as·uncommitted |
| 22 | ····changed·in·the·working·directory. | 22 | ····changed·in·the·working·directory. |
| 23 | ···· | 23 | ····Gibt·0·bei·Erfolg·zurück,·wenn·nichts·geändert·wurde. |
| 24 | options·([+]·can·be·repeated): | 24 | options·([+]·can·be·repeated): |
| 25 | ·-A·--addremove···········mark·new/missing·files·as·added/removed·before | ||
| 26 | · | 25 | ·-A·--addremove···········Markiert·neue/fehlende·Dateien·als |
| 26 | ··························hinzugefügt/entfernt | ||
| 27 | ·-a·--all·················match·all·files | 27 | ·-a·--all·················match·all·files |
| 28 | ·-e·--edit················ | 28 | ·-e·--edit················Ruft·Editor·zum·Setzen·der·Versionsmeldung·auf |
| 29 | ····--extract·············extract·changes·from·the·commit·to·the·working·copy | 29 | ····--extract·············extract·changes·from·the·commit·to·the·working·copy |
| 30 | ····--patch···············make·changes·to·wdir·parent·by·editing·patch | 30 | ····--patch···············make·changes·to·wdir·parent·by·editing·patch |
| 31 | ····--close-branch········mark·a·branch·as·closed,·hiding·it·from·the·branch | ||
| 32 | ··························list | ||
| 33 | · | 31 | ····--close-branch········Markiert·einen·Branch·als·geschlossen·und·blendet |
| 32 | ··························ihn·in·der·Branchlist·aus | ||
| 33 | ·-s·--secret··············Beim·Ãbernehmen·die·gemeine·Phase·(secret)·benutzen | ||
| 34 | ·-n·--note·TEXT···········store·a·note·on·amend | 34 | ·-n·--note·TEXT···········store·a·note·on·amend |
| 35 | ·-I·--include·PATTERN·[+]·include·names·matching·the·given·patterns | ||
| 36 | ·- | 35 | ·-I·--include·PATTERN·[+]·Namen·hinzufügen,·die·auf·das·angegebene·Muster |
| 36 | ··························passen | ||
| 37 | ·-X·--exclude·PATTERN·[+]·Namen·ausschlieÃen,·die·auf·das·angegebene·Muster | ||
| 38 | ··························passen | ||
| 37 | ·-m·--message·TEXT········u | 39 | ·-m·--message·TEXT········Nutzt·Text·als·Commit-Nachricht |
| 38 | ·-l·--logfile·FILE········read·commit·message·from·file | ||
| 39 | ·-d·--date·DATE···········record·the·specified·date·as·commit·date | ||
| 40 | ·-u·--user·USER···········record·the·specified·user·as·committer | ||
| 41 | ·-D·--current-date········record·the·current·date·as·commit·date | ||
| 42 | ·- | 40 | ·-l·--logfile·DATEI·······Liest·Commit-Nachricht·aus·Datei |
| 41 | ·-d·--date·DATUM··········Protokolliert·das·angegebenen·Datum·als | ||
| 42 | ··························Ãbernahmedatum | ||
| 43 | ·-u·--user·BENUTZER·······Protokolliert·den·angegebenen·Nutzer·als·Autor | ||
| 44 | ·-D·--current-date········Protokolliert·das·aktuelle·Datum·als·Commit-Datum | ||
| 45 | ·-U·--current-user········Protokolliert·den·aktuellen·Nutzer·als·Autor | ||
| 43 | ·-i·--interactive·········use·interactive·mode | 46 | ·-i·--interactive·········use·interactive·mode |
| 44 | (some·details·hidden,·use·--verbose·to·show·complete·help) | 47 | (some·details·hidden,·use·--verbose·to·show·complete·help) |
| 45 | *****·evolve¶·***** | 48 | *****·evolve¶·***** |
| 46 | hg·evolve·[OPTIONS]... | 49 | hg·evolve·[OPTIONS]... |
| 47 | 50 | Aliase:·stabilize,·solve | |
| 48 | solve·troubled·changesets·in·your·repository | 51 | solve·troubled·changesets·in·your·repository |
| 49 | ····Modifying·history·can·lead·to·various·types·of·troubled·changesets: | 52 | ····Modifying·history·can·lead·to·various·types·of·troubled·changesets: |
| 50 | ····orphan,·phase-divergent,·or·content-divergent.·The·evolve·command·resolves | 53 | ····orphan,·phase-divergent,·or·content-divergent.·The·evolve·command·resolves |
| 51 | ····your·troubles·by·executing·one·of·the·following·actions: | 54 | ····your·troubles·by·executing·one·of·the·following·actions: |
| Offset 1, 28 lines modified | Offset 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 | ········" | 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], |