Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 45510:1f5c548f15e5
rebase: fix an inconsistent hyphenation in a debug message
We used "rebasing on disk" but "rebasing in-memory". I believe the
former is correct, so I used that.
Differential Revision: https://phab.mercurial-scm.org/D9054
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 18 Sep 2020 10:04:02 -0700 |
| parents | 5780a04a1b46 |
| children | feffeb18d412 |
comparison
equal
deleted
inserted
replaced
| 45507:df87821081ee | 45510:1f5c548f15e5 |
|---|---|
| 39 $ hg cat -r 3 c | 39 $ hg cat -r 3 c |
| 40 c (no-eol) | 40 c (no-eol) |
| 41 $ hg cat -r 2 b | 41 $ hg cat -r 2 b |
| 42 b (no-eol) | 42 b (no-eol) |
| 43 $ hg rebase --debug -r b -d c | grep rebasing | 43 $ hg rebase --debug -r b -d c | grep rebasing |
| 44 rebasing in-memory | 44 rebasing in memory |
| 45 rebasing 2:db0e82a16a62 "b" (b) | 45 rebasing 2:db0e82a16a62 "b" (b) |
| 46 $ hg tglog | 46 $ hg tglog |
| 47 o 3: ca58782ad1e4 'b' | 47 o 3: ca58782ad1e4 'b' |
| 48 | | 48 | |
| 49 o 2: 814f6bd05178 'c' | 49 o 2: 814f6bd05178 'c' |
| 99 $ hg cat -r 2 b | 99 $ hg cat -r 2 b |
| 100 b (no-eol) | 100 b (no-eol) |
| 101 $ hg cat -r 3 e | 101 $ hg cat -r 3 e |
| 102 somefile (no-eol) | 102 somefile (no-eol) |
| 103 $ hg rebase --debug -s b -d a | grep rebasing | 103 $ hg rebase --debug -s b -d a | grep rebasing |
| 104 rebasing in-memory | 104 rebasing in memory |
| 105 rebasing 2:db0e82a16a62 "b" (b) | 105 rebasing 2:db0e82a16a62 "b" (b) |
| 106 $ hg tglog | 106 $ hg tglog |
| 107 o 3: fc055c3b4d33 'b' | 107 o 3: fc055c3b4d33 'b' |
| 108 | | 108 | |
| 109 | o 2: f56b71190a8f 'c' | 109 | o 2: f56b71190a8f 'c' |
| 115 $ hg cat -r 2 c | 115 $ hg cat -r 2 c |
| 116 c (no-eol) | 116 c (no-eol) |
| 117 $ hg cat -r 3 b | 117 $ hg cat -r 3 b |
| 118 b (no-eol) | 118 b (no-eol) |
| 119 $ hg rebase --debug -s 1 -d 3 | grep rebasing | 119 $ hg rebase --debug -s 1 -d 3 | grep rebasing |
| 120 rebasing in-memory | 120 rebasing in memory |
| 121 rebasing 1:02952614a83d "d" (d) | 121 rebasing 1:02952614a83d "d" (d) |
| 122 rebasing 2:f56b71190a8f "c" | 122 rebasing 2:f56b71190a8f "c" |
| 123 $ hg tglog | 123 $ hg tglog |
| 124 o 3: 753feb6fd12a 'c' | 124 o 3: 753feb6fd12a 'c' |
| 125 | | 125 | |
| 146 | 146 |
| 147 Rebase the working copy parent | 147 Rebase the working copy parent |
| 148 $ hg up -C 3 | 148 $ hg up -C 3 |
| 149 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 149 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 150 $ hg rebase -r 3 -d 0 --debug | grep rebasing | 150 $ hg rebase -r 3 -d 0 --debug | grep rebasing |
| 151 rebasing in-memory | 151 rebasing in memory |
| 152 rebasing 3:753feb6fd12a "c" (tip) | 152 rebasing 3:753feb6fd12a "c" (tip) |
| 153 $ hg tglog | 153 $ hg tglog |
| 154 @ 3: 844a7de3e617 'c' | 154 @ 3: 844a7de3e617 'c' |
| 155 | | 155 | |
| 156 | o 2: 09c044d2cb43 'd' | 156 | o 2: 09c044d2cb43 'd' |