Mercurial > hg

comparison tests/test-commit-amend.t @ 26927:0829ed3b75e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: use general delta for 'test-commit-amend.t' Using general delta introduces harmless changes to some of the test output.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 20 Oct 2015 12:09:18 +0200
parents 9f9ec4abe700
children 27b89a0957ec
comparison
equal deleted inserted replaced
26926:b87b252415ad 26927:0829ed3b75e1
1 $ cat << EOF >> $HGRCPATH
2 > [format]
3 > usegeneraldelta=yes
4 > EOF
5
1 $ hg init 6 $ hg init
2 7
3 Setup: 8 Setup:
4 9
5 $ echo a >> a 10 $ echo a >> a
113 committing manifest 118 committing manifest
114 committing changelog 119 committing changelog
115 stripping amended changeset 74609c7f506e 120 stripping amended changeset 74609c7f506e
116 1 changesets found 121 1 changesets found
117 uncompressed size of bundle content: 122 uncompressed size of bundle content:
118 250 (changelog) 123 270 (changelog)
119 143 (manifests) 124 163 (manifests)
120 109 a 125 129 a
121 saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-1bfde511-amend-backup.hg (glob) 126 saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-1bfde511-amend-backup.hg (glob)
122 1 changesets found 127 1 changesets found
123 uncompressed size of bundle content: 128 uncompressed size of bundle content:
124 246 (changelog) 129 266 (changelog)
125 143 (manifests) 130 163 (manifests)
126 109 a 131 129 a
127 adding branch 132 adding branch
128 adding changesets 133 adding changesets
129 adding manifests 134 adding manifests
130 adding file changes 135 adding file changes
131 added 1 changesets with 1 changes to 1 files 136 added 1 changesets with 1 changes to 1 files
257 committing manifest 262 committing manifest
258 committing changelog 263 committing changelog
259 stripping amended changeset 5f357c7560ab 264 stripping amended changeset 5f357c7560ab
260 1 changesets found 265 1 changesets found
261 uncompressed size of bundle content: 266 uncompressed size of bundle content:
262 238 (changelog) 267 258 (changelog)
263 143 (manifests) 268 163 (manifests)
264 111 a 269 131 a
265 saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-e7c84ade-amend-backup.hg (glob) 270 saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-e7c84ade-amend-backup.hg (glob)
266 1 changesets found 271 1 changesets found
267 uncompressed size of bundle content: 272 uncompressed size of bundle content:
268 246 (changelog) 273 266 (changelog)
269 143 (manifests) 274 163 (manifests)
270 111 a 275 131 a
271 adding branch 276 adding branch
272 adding changesets 277 adding changesets
273 adding manifests 278 adding manifests
274 adding file changes 279 adding file changes
275 added 1 changesets with 1 changes to 1 files 280 added 1 changesets with 1 changes to 1 files
300 committing changelog 305 committing changelog
301 stripping intermediate changeset a0ea9b1a4c8c 306 stripping intermediate changeset a0ea9b1a4c8c
302 stripping amended changeset 7ab3bf440b54 307 stripping amended changeset 7ab3bf440b54
303 2 changesets found 308 2 changesets found
304 uncompressed size of bundle content: 309 uncompressed size of bundle content:
305 450 (changelog) 310 490 (changelog)
306 282 (manifests) 311 322 (manifests)
307 209 a 312 249 a
308 saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-8e3b5088-amend-backup.hg (glob) 313 saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-8e3b5088-amend-backup.hg (glob)
309 1 changesets found 314 1 changesets found
310 uncompressed size of bundle content: 315 uncompressed size of bundle content:
311 246 (changelog) 316 266 (changelog)
312 143 (manifests) 317 163 (manifests)
313 113 a 318 133 a
314 adding branch 319 adding branch
315 adding changesets 320 adding changesets
316 adding manifests 321 adding manifests
317 adding file changes 322 adding file changes
318 added 1 changesets with 1 changes to 1 files 323 added 1 changesets with 1 changes to 1 files
1136 A newdirname/newfile.py 1141 A newdirname/newfile.py
1137 olddirname/newfile.py 1142 olddirname/newfile.py
1138 R olddirname/commonfile.py 1143 R olddirname/commonfile.py
1139 R olddirname/newfile.py 1144 R olddirname/newfile.py
1140 $ hg debugindex newdirname/newfile.py 1145 $ hg debugindex newdirname/newfile.py
1141 rev offset length base linkrev nodeid p1 p2 1146 rev offset length delta linkrev nodeid p1 p2
1142 0 0 88 0 3 34a4d536c0c0 000000000000 000000000000 1147 0 0 88 -1 3 34a4d536c0c0 000000000000 000000000000
1143 1148
1144 $ echo a >> newdirname/commonfile.py 1149 $ echo a >> newdirname/commonfile.py
1145 $ hg ci --amend -m bug 1150 $ hg ci --amend -m bug
1146 $ hg debugrename newdirname/newfile.py 1151 $ hg debugrename newdirname/newfile.py
1147 newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def (glob) 1152 newdirname/newfile.py renamed from olddirname/newfile.py:690b295714aed510803d3020da9c70fca8336def (glob)
1148 $ hg debugindex newdirname/newfile.py 1153 $ hg debugindex newdirname/newfile.py
1149 rev offset length base linkrev nodeid p1 p2 1154 rev offset length delta linkrev nodeid p1 p2
1150 0 0 88 0 3 34a4d536c0c0 000000000000 000000000000 1155 0 0 88 -1 3 34a4d536c0c0 000000000000 000000000000
1151 1156