Mercurial > hg

comparison tests/test-absorb-rename.t @ 40188:2c5316796f45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
absorb: print summary of changesets affected Differential Revision: https://phab.mercurial-scm.org/D4998
author Mark Thomas <mbthomas@fb.com>
date Fri, 12 Oct 2018 15:46:51 +0000
parents 5111d11b8719
children 31dfa7dac4c9
comparison
equal deleted inserted replaced
40187:dcda50856843 40188:2c5316796f45
41 bf56e1f -2 41 bf56e1f -2
42 0b888b0 -3 42 0b888b0 -3
43 eff892d +1a 43 eff892d +1a
44 bf56e1f +2a 44 bf56e1f +2a
45 0b888b0 +3a 45 0b888b0 +3a
46
47 3 changesets affected
48 0b888b0 3
49 bf56e1f 2
50 eff892d 1
46 51
47 $ hg status 52 $ hg status
48 53
49 $ hg annotate -ncf a 54 $ hg annotate -ncf a
50 0 5d1c5620e6f2 a: 1a 55 0 5d1c5620e6f2 a: 1a
64 9a14ffe -2a 69 9a14ffe -2a
65 9191d12 -3a 70 9191d12 -3a
66 +1A 71 +1A
67 9a14ffe +2A 72 9a14ffe +2A
68 9191d12 +3A 73 9191d12 +3A
74
75 2 changesets affected
76 9191d12 3
77 9a14ffe 2
69 78
70 $ hg diff 79 $ hg diff
71 diff --git a/a b/a 80 diff --git a/a b/a
72 --- a/a 81 --- a/a
73 +++ b/a 82 +++ b/a
105 @@ -0,2 +0,2 @@ 114 @@ -0,2 +0,2 @@
106 -1 115 -1
107 17b7212 -2 116 17b7212 -2
108 +1b 117 +1b
109 17b7212 +2b 118 17b7212 +2b
119
120 2 changesets affected
121 17b7212 2
122 eff892d 1
110 123
111 $ hg diff 124 $ hg diff
112 diff --git a/b b/b 125 diff --git a/b b/b
113 --- a/b 126 --- a/b
114 +++ b/b 127 +++ b/b
145 e62c256 +2a 158 e62c256 +2a
146 showing changes for b 159 showing changes for b
147 @@ -0,1 +0,1 @@ 160 @@ -0,1 +0,1 @@
148 55105f9 -1 161 55105f9 -1
149 55105f9 +1a 162 55105f9 +1a
163
164 2 changesets affected
165 e62c256 2
166 55105f9 1
150 167
151 $ hg diff 168 $ hg diff
152 diff --git a/a b/a 169 diff --git a/a b/a
153 --- a/a 170 --- a/a
154 +++ b/a 171 +++ b/a
190 @@ -0,2 +0,2 @@ 207 @@ -0,2 +0,2 @@
191 -1 208 -1
192 366daad -3 209 366daad -3
193 +1c 210 +1c
194 366daad +3c 211 366daad +3c
212
213 2 changesets affected
214 366daad cp
215 55105f9 1
195 216
196 $ hg log -G -p -T '{rev}:{node|short} {desc}\n' 217 $ hg log -G -p -T '{rev}:{node|short} {desc}\n'
197 @ 1:70606019f91b cp 218 @ 1:70606019f91b cp
198 | diff --git a/b b/a 219 | diff --git a/b b/a
199 | rename from b 220 | rename from b
226 $ hg absorb -pq 247 $ hg absorb -pq
227 showing changes for c 248 showing changes for c
228 @@ -0,1 +0,1 @@ 249 @@ -0,1 +0,1 @@
229 7060601 -1 250 7060601 -1
230 7060601 +1c 251 7060601 +1c
252
253 1 changesets affected
254 7060601 cp
231 255
232 $ hg log -G -p -T '{rev}:{node|short} {desc}\n' 256 $ hg log -G -p -T '{rev}:{node|short} {desc}\n'
233 @ 1:8bd536cce368 cp 257 @ 1:8bd536cce368 cp
234 | diff --git a/b b/a 258 | diff --git a/b b/a
235 | rename from b 259 | rename from b
296 @@ -0,2 +0,2 @@ 320 @@ -0,2 +0,2 @@
297 -1 321 -1
298 7bc3d43 -2 322 7bc3d43 -2
299 +1e 323 +1e
300 7bc3d43 +2e 324 7bc3d43 +2e
325
326 2 changesets affected
327 7bc3d43 cp
328 55105f9 1
301 329
302 $ hg diff 330 $ hg diff
303 diff --git a/e b/e 331 diff --git a/e b/e
304 --- a/e 332 --- a/e
305 +++ b/e 333 +++ b/e