##// END OF EJS Templates
bundles: do not overwrite existing backup bundles (BC)...
Durham Goode -
r23835:aa4a1672 default
parent child Browse files
Show More
@@ -6,8 +6,8 b''
6 # This software may be used and distributed according to the terms of the
6 # This software may be used and distributed according to the terms of the
7 # GNU General Public License version 2 or any later version.
7 # GNU General Public License version 2 or any later version.
8
8
9 from mercurial import changegroup, exchange
9 from mercurial import changegroup, exchange, util
10 from mercurial.node import short
10 from mercurial.node import short, hex
11 from mercurial.i18n import _
11 from mercurial.i18n import _
12 import errno
12 import errno
13
13
@@ -18,7 +18,15 b' def _bundle(repo, bases, heads, node, su'
18 vfs = repo.vfs
18 vfs = repo.vfs
19 if not vfs.isdir(backupdir):
19 if not vfs.isdir(backupdir):
20 vfs.mkdir(backupdir)
20 vfs.mkdir(backupdir)
21 name = "%s/%s-%s.hg" % (backupdir, short(node), suffix)
21
22 # Include a hash of all the nodes in the filename for uniqueness
23 hexbases = (hex(n) for n in bases)
24 hexheads = (hex(n) for n in heads)
25 allcommits = repo.set('%ls::%ls', hexbases, hexheads)
26 allhashes = sorted(c.hex() for c in allcommits)
27 totalhash = util.sha1(''.join(allhashes)).hexdigest()
28 name = "%s/%s-%s-%s.hg" % (backupdir, short(node), totalhash[:8], suffix)
29
22 if compress:
30 if compress:
23 bundletype = "HG10BZ"
31 bundletype = "HG10BZ"
24 else:
32 else:
@@ -38,7 +38,7 b' rebase'
38
38
39 $ hg rebase -s two -d one
39 $ hg rebase -s two -d one
40 rebasing 3:2ae46b1d99a7 "3" (tip two)
40 rebasing 3:2ae46b1d99a7 "3" (tip two)
41 saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-backup.hg (glob)
41 saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-backup.hg (glob)
42
42
43 $ hg log
43 $ hg log
44 changeset: 3:42e5ed2cdcf4
44 changeset: 3:42e5ed2cdcf4
@@ -35,7 +35,7 b' Amending changeset with changes in worki'
35 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1'
35 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1'
36 pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149
36 pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149
37 43f1ba15f28a tip
37 43f1ba15f28a tip
38 saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob)
38 saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-f1bf3ab8-amend-backup.hg (glob)
39 $ echo 'pretxncommit.foo = ' >> $HGRCPATH
39 $ echo 'pretxncommit.foo = ' >> $HGRCPATH
40 $ hg diff -c .
40 $ hg diff -c .
41 diff -r ad120869acf0 -r 43f1ba15f28a a
41 diff -r ad120869acf0 -r 43f1ba15f28a a
@@ -86,7 +86,7 b' Check proper abort for empty message'
86
86
87 Add new file:
87 Add new file:
88 $ hg ci --amend -m 'amend base1 new file'
88 $ hg ci --amend -m 'amend base1 new file'
89 saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg (glob)
89 saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-7a3b3496-amend-backup.hg (glob)
90
90
91 Remove file that was added in amended commit:
91 Remove file that was added in amended commit:
92 (and test logfile option)
92 (and test logfile option)
@@ -95,7 +95,7 b' Remove file that was added in amended co'
95 $ hg rm b
95 $ hg rm b
96 $ echo 'amend base1 remove new file' > ../logfile
96 $ echo 'amend base1 remove new file' > ../logfile
97 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile
97 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile
98 saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg (glob)
98 saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-0b55739a-amend-backup.hg (glob)
99
99
100 $ hg cat b
100 $ hg cat b
101 b: no such file in rev 74609c7f506e
101 b: no such file in rev 74609c7f506e
@@ -116,7 +116,7 b' No changes, just a different message:'
116 250 (changelog)
116 250 (changelog)
117 143 (manifests)
117 143 (manifests)
118 109 a
118 109 a
119 saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-amend-backup.hg (glob)
119 saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-1bfde511-amend-backup.hg (glob)
120 1 changesets found
120 1 changesets found
121 uncompressed size of bundle content:
121 uncompressed size of bundle content:
122 246 (changelog)
122 246 (changelog)
@@ -162,10 +162,10 b' Test -u/-d:'
162 > EOF
162 > EOF
163 $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -u foo -d '1 0'
163 $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -u foo -d '1 0'
164 HGEDITFORM=commit.amend.normal
164 HGEDITFORM=commit.amend.normal
165 saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-amend-backup.hg (glob)
165 saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-5f5bcb85-amend-backup.hg (glob)
166 $ echo a >> a
166 $ echo a >> a
167 $ hg ci --amend -u foo -d '1 0'
167 $ hg ci --amend -u foo -d '1 0'
168 saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-amend-backup.hg (glob)
168 saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-83b10a27-amend-backup.hg (glob)
169 $ hg log -r .
169 $ hg log -r .
170 changeset: 1:5f357c7560ab
170 changeset: 1:5f357c7560ab
171 tag: tip
171 tag: tip
@@ -260,7 +260,7 b' then, test editing custom commit message'
260 238 (changelog)
260 238 (changelog)
261 143 (manifests)
261 143 (manifests)
262 111 a
262 111 a
263 saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-amend-backup.hg (glob)
263 saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-e7c84ade-amend-backup.hg (glob)
264 1 changesets found
264 1 changesets found
265 uncompressed size of bundle content:
265 uncompressed size of bundle content:
266 246 (changelog)
266 246 (changelog)
@@ -303,7 +303,7 b' Same, but with changes in working dir (d'
303 450 (changelog)
303 450 (changelog)
304 282 (manifests)
304 282 (manifests)
305 209 a
305 209 a
306 saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-amend-backup.hg (glob)
306 saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-8e3b5088-amend-backup.hg (glob)
307 1 changesets found
307 1 changesets found
308 uncompressed size of bundle content:
308 uncompressed size of bundle content:
309 246 (changelog)
309 246 (changelog)
@@ -330,13 +330,13 b' Moving bookmarks, preserve active bookma'
330 $ hg book book1
330 $ hg book book1
331 $ hg book book2
331 $ hg book book2
332 $ hg ci --amend -m 'move bookmarks'
332 $ hg ci --amend -m 'move bookmarks'
333 saved backup bundle to $TESTTMP/.hg/strip-backup/ea22a388757c-amend-backup.hg (glob)
333 saved backup bundle to $TESTTMP/.hg/strip-backup/ea22a388757c-e51094db-amend-backup.hg (glob)
334 $ hg book
334 $ hg book
335 book1 1:6cec5aa930e2
335 book1 1:6cec5aa930e2
336 * book2 1:6cec5aa930e2
336 * book2 1:6cec5aa930e2
337 $ echo a >> a
337 $ echo a >> a
338 $ hg ci --amend -m 'move bookmarks'
338 $ hg ci --amend -m 'move bookmarks'
339 saved backup bundle to $TESTTMP/.hg/strip-backup/6cec5aa930e2-amend-backup.hg (glob)
339 saved backup bundle to $TESTTMP/.hg/strip-backup/6cec5aa930e2-e9b06de4-amend-backup.hg (glob)
340 $ hg book
340 $ hg book
341 book1 1:48bb6e53a15f
341 book1 1:48bb6e53a15f
342 * book2 1:48bb6e53a15f
342 * book2 1:48bb6e53a15f
@@ -373,7 +373,7 b' Moving branches:'
373 marked working directory as branch default
373 marked working directory as branch default
374 (branches are permanent and global, did you want a bookmark?)
374 (branches are permanent and global, did you want a bookmark?)
375 $ hg ci --amend -m 'back to default'
375 $ hg ci --amend -m 'back to default'
376 saved backup bundle to $TESTTMP/.hg/strip-backup/8ac881fbf49d-amend-backup.hg (glob)
376 saved backup bundle to $TESTTMP/.hg/strip-backup/8ac881fbf49d-fd962fef-amend-backup.hg (glob)
377 $ hg branches
377 $ hg branches
378 default 2:ce12b0b57d46
378 default 2:ce12b0b57d46
379
379
@@ -389,7 +389,7 b' Close branch:'
389 $ echo b >> b
389 $ echo b >> b
390 $ hg ci -mb
390 $ hg ci -mb
391 $ hg ci --amend --close-branch -m 'closing branch foo'
391 $ hg ci --amend --close-branch -m 'closing branch foo'
392 saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg (glob)
392 saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-6701c392-amend-backup.hg (glob)
393
393
394 Same thing, different code path:
394 Same thing, different code path:
395
395
@@ -398,7 +398,7 b' Same thing, different code path:'
398 reopening closed branch head 4
398 reopening closed branch head 4
399 $ echo b >> b
399 $ echo b >> b
400 $ hg ci --amend --close-branch
400 $ hg ci --amend --close-branch
401 saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-amend-backup.hg (glob)
401 saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-49c0c55d-amend-backup.hg (glob)
402 $ hg branches
402 $ hg branches
403 default 2:ce12b0b57d46
403 default 2:ce12b0b57d46
404
404
@@ -419,7 +419,7 b' Follow copies/renames:'
419 $ hg ci -m 'b -> c'
419 $ hg ci -m 'b -> c'
420 $ hg mv c d
420 $ hg mv c d
421 $ hg ci --amend -m 'b -> d'
421 $ hg ci --amend -m 'b -> d'
422 saved backup bundle to $TESTTMP/.hg/strip-backup/b8c6eac7f12e-amend-backup.hg (glob)
422 saved backup bundle to $TESTTMP/.hg/strip-backup/b8c6eac7f12e-adaaa8b1-amend-backup.hg (glob)
423 $ hg st --rev '.^' --copies d
423 $ hg st --rev '.^' --copies d
424 A d
424 A d
425 b
425 b
@@ -427,7 +427,7 b' Follow copies/renames:'
427 $ hg ci -m 'e = d'
427 $ hg ci -m 'e = d'
428 $ hg cp e f
428 $ hg cp e f
429 $ hg ci --amend -m 'f = d'
429 $ hg ci --amend -m 'f = d'
430 saved backup bundle to $TESTTMP/.hg/strip-backup/7f9761d65613-amend-backup.hg (glob)
430 saved backup bundle to $TESTTMP/.hg/strip-backup/7f9761d65613-d37aa788-amend-backup.hg (glob)
431 $ hg st --rev '.^' --copies f
431 $ hg st --rev '.^' --copies f
432 A f
432 A f
433 d
433 d
@@ -438,7 +438,7 b' Follow copies/renames:'
438 $ hg cp a f
438 $ hg cp a f
439 $ mv f.orig f
439 $ mv f.orig f
440 $ hg ci --amend -m replacef
440 $ hg ci --amend -m replacef
441 saved backup bundle to $TESTTMP/.hg/strip-backup/9e8c5f7e3d95-amend-backup.hg (glob)
441 saved backup bundle to $TESTTMP/.hg/strip-backup/9e8c5f7e3d95-90259f67-amend-backup.hg (glob)
442 $ hg st --change . --copies
442 $ hg st --change . --copies
443 $ hg log -r . --template "{file_copies}\n"
443 $ hg log -r . --template "{file_copies}\n"
444
444
@@ -450,7 +450,7 b' Move added file (issue3410):'
450 adding g
450 adding g
451 $ hg mv g h
451 $ hg mv g h
452 $ hg ci --amend
452 $ hg ci --amend
453 saved backup bundle to $TESTTMP/.hg/strip-backup/24aa8eacce2b-amend-backup.hg (glob)
453 saved backup bundle to $TESTTMP/.hg/strip-backup/24aa8eacce2b-7059e0f1-amend-backup.hg (glob)
454 $ hg st --change . --copies h
454 $ hg st --change . --copies h
455 A h
455 A h
456 $ hg log -r . --template "{file_copies}\n"
456 $ hg log -r . --template "{file_copies}\n"
@@ -470,11 +470,11 b' Preserve extra dict (issue3430):'
470 $ echo a >> a
470 $ echo a >> a
471 $ hg ci -ma
471 $ hg ci -ma
472 $ hg ci --amend -m "a'"
472 $ hg ci --amend -m "a'"
473 saved backup bundle to $TESTTMP/.hg/strip-backup/3837aa2a2fdb-amend-backup.hg (glob)
473 saved backup bundle to $TESTTMP/.hg/strip-backup/3837aa2a2fdb-2be01fd1-amend-backup.hg (glob)
474 $ hg log -r . --template "{branch}\n"
474 $ hg log -r . --template "{branch}\n"
475 a
475 a
476 $ hg ci --amend -m "a''"
476 $ hg ci --amend -m "a''"
477 saved backup bundle to $TESTTMP/.hg/strip-backup/c05c06be7514-amend-backup.hg (glob)
477 saved backup bundle to $TESTTMP/.hg/strip-backup/c05c06be7514-ed28c4cd-amend-backup.hg (glob)
478 $ hg log -r . --template "{branch}\n"
478 $ hg log -r . --template "{branch}\n"
479 a
479 a
480
480
@@ -491,7 +491,7 b" first graft something so there's an addi"
491 $ hg graft 12
491 $ hg graft 12
492 grafting 12:2647734878ef "fork" (tip)
492 grafting 12:2647734878ef "fork" (tip)
493 $ hg ci --amend -m 'graft amend'
493 $ hg ci --amend -m 'graft amend'
494 saved backup bundle to $TESTTMP/.hg/strip-backup/bd010aea3f39-amend-backup.hg (glob)
494 saved backup bundle to $TESTTMP/.hg/strip-backup/bd010aea3f39-eedb103b-amend-backup.hg (glob)
495 $ hg log -r . --debug | grep extra
495 $ hg log -r . --debug | grep extra
496 extra: amend_source=bd010aea3f39f3fb2a2f884b9ccb0471cd77398e
496 extra: amend_source=bd010aea3f39f3fb2a2f884b9ccb0471cd77398e
497 extra: branch=a
497 extra: branch=a
@@ -637,7 +637,7 b' test named branch pruning'
637 $ cd namedbranch
637 $ cd namedbranch
638 $ hg --config extensions.mq= strip tip
638 $ hg --config extensions.mq= strip tip
639 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
639 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
640 saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-backup.hg (glob)
640 saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-92adf160-backup.hg (glob)
641 $ hg up foo
641 $ hg up foo
642 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
642 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
643 $ hg merge default
643 $ hg merge default
@@ -256,7 +256,7 b" Make sure our changes don't affect the r"
256 $ hg --cwd a up 5
256 $ hg --cwd a up 5
257 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
257 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
258 $ hg --cwd a --config extensions.strip= strip -r 6
258 $ hg --cwd a --config extensions.strip= strip -r 6
259 saved backup bundle to $TESTTMP/a/.hg/strip-backup/bd4f7b7a7067-backup.hg (glob)
259 saved backup bundle to $TESTTMP/a/.hg/strip-backup/bd4f7b7a7067-ed505e42-backup.hg (glob)
260
260
261 #endif
261 #endif
262
262
@@ -712,7 +712,7 b' but do some destructive editing of the r'
712 $ hg up -qC 7
712 $ hg up -qC 7
713 $ hg tag -l -r 13 tmp
713 $ hg tag -l -r 13 tmp
714 $ hg --config extensions.strip= strip 2
714 $ hg --config extensions.strip= strip 2
715 saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-backup.hg (glob)
715 saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg (glob)
716 $ hg graft tmp
716 $ hg graft tmp
717 skipping already grafted revision 8:9db0f28fd374 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f)
717 skipping already grafted revision 8:9db0f28fd374 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f)
718 [255]
718 [255]
@@ -18,11 +18,11 b' Produce a bundle to use'
18
18
19 $ hg strip -r 1
19 $ hg strip -r 1
20 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
20 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
21 saved backup bundle to $TESTTMP/server/.hg/strip-backup/ed602e697e0f-backup.hg (glob)
21 saved backup bundle to $TESTTMP/server/.hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg (glob)
22
22
23 Serve from a bundle file
23 Serve from a bundle file
24
24
25 $ hg serve -R .hg/strip-backup/ed602e697e0f-backup.hg -d -p $HGPORT --pid-file=hg.pid
25 $ hg serve -R .hg/strip-backup/ed602e697e0f-cc9fff6a-backup.hg -d -p $HGPORT --pid-file=hg.pid
26 $ cat hg.pid >> $DAEMON_PIDS
26 $ cat hg.pid >> $DAEMON_PIDS
27
27
28 Ensure we're serving from the bundle
28 Ensure we're serving from the bundle
@@ -91,8 +91,8 b''
91 histedit: moving bookmarks three from 055a42cdd887 to 59d9f330561f
91 histedit: moving bookmarks three from 055a42cdd887 to 59d9f330561f
92 histedit: moving bookmarks two from 177f92b77385 to b346ab9a313d
92 histedit: moving bookmarks two from 177f92b77385 to b346ab9a313d
93 histedit: moving bookmarks will-move-backwards from d2ae7f538514 to cb9a9f314b8b
93 histedit: moving bookmarks will-move-backwards from d2ae7f538514 to cb9a9f314b8b
94 saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg (glob)
94 saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-48787b8d-backup.hg (glob)
95 saved backup bundle to $TESTTMP/r/.hg/strip-backup/96e494a2d553-backup.hg (glob)
95 saved backup bundle to $TESTTMP/r/.hg/strip-backup/96e494a2d553-60cea58b-backup.hg (glob)
96 $ hg log --graph
96 $ hg log --graph
97 @ changeset: 3:cacdfd884a93
97 @ changeset: 3:cacdfd884a93
98 | bookmark: five
98 | bookmark: five
@@ -147,7 +147,7 b''
147 histedit: moving bookmarks five from cacdfd884a93 to c04e50810e4b
147 histedit: moving bookmarks five from cacdfd884a93 to c04e50810e4b
148 histedit: moving bookmarks four from 59d9f330561f to c04e50810e4b
148 histedit: moving bookmarks four from 59d9f330561f to c04e50810e4b
149 histedit: moving bookmarks three from 59d9f330561f to c04e50810e4b
149 histedit: moving bookmarks three from 59d9f330561f to c04e50810e4b
150 saved backup bundle to $TESTTMP/r/.hg/strip-backup/59d9f330561f-backup.hg (glob)
150 saved backup bundle to $TESTTMP/r/.hg/strip-backup/59d9f330561f-073008af-backup.hg (glob)
151
151
152 We expect 'five' to stay at tip, since the tipmost bookmark is most
152 We expect 'five' to stay at tip, since the tipmost bookmark is most
153 likely the useful signal.
153 likely the useful signal.
@@ -170,7 +170,7 b' check histedit_source'
170 HG: branch 'default'
170 HG: branch 'default'
171 HG: added f
171 HG: added f
172 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
172 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
173 saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-backup.hg (glob)
173 saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-c28d9c86-backup.hg (glob)
174
174
175 $ hg status
175 $ hg status
176
176
@@ -342,4 +342,4 b' rollback should not work after a histedi'
342 [1]
342 [1]
343 $ HGEDITOR=true hg histedit --continue
343 $ HGEDITOR=true hg histedit --continue
344 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
344 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
345 saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-backup.hg (glob)
345 saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-backup.hg (glob)
@@ -387,7 +387,7 b' dropped revision.'
387 HG: changed file
387 HG: changed file
388 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
388 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
389 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
389 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
390 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg (glob)
390 saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-3d69522c-backup.hg (glob)
391 $ hg logt -G
391 $ hg logt -G
392 @ 1:10c647b2cdd5 +4
392 @ 1:10c647b2cdd5 +4
393 |
393 |
@@ -64,7 +64,7 b' Enable obsolete'
64 > fold e860deea161a 4 e
64 > fold e860deea161a 4 e
65 > pick 652413bf663e 5 f
65 > pick 652413bf663e 5 f
66 > EOF
66 > EOF
67 saved backup bundle to $TESTTMP/base/.hg/strip-backup/96e494a2d553-backup.hg (glob)
67 saved backup bundle to $TESTTMP/base/.hg/strip-backup/96e494a2d553-60cea58b-backup.hg (glob)
68 $ hg log --graph --hidden
68 $ hg log --graph --hidden
69 @ 8:cacdfd884a93 f
69 @ 8:cacdfd884a93 f
70 |
70 |
@@ -427,9 +427,9 b' Note that there is a few reordering in t'
427 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
427 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
428 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
428 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
429 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
429 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
430 saved backup bundle to $TESTTMP/folding/.hg/strip-backup/58019c66f35f-backup.hg (glob)
430 saved backup bundle to $TESTTMP/folding/.hg/strip-backup/58019c66f35f-be4b3835-backup.hg (glob)
431 saved backup bundle to $TESTTMP/folding/.hg/strip-backup/83d1858e070b-backup.hg (glob)
431 saved backup bundle to $TESTTMP/folding/.hg/strip-backup/83d1858e070b-08306a6b-backup.hg (glob)
432 saved backup bundle to $TESTTMP/folding/.hg/strip-backup/859969f5ed7e-backup.hg (glob)
432 saved backup bundle to $TESTTMP/folding/.hg/strip-backup/859969f5ed7e-86c99c41-backup.hg (glob)
433 $ hg log -G
433 $ hg log -G
434 @ 19:f9daec13fb98 (secret) i
434 @ 19:f9daec13fb98 (secret) i
435 |
435 |
@@ -366,15 +366,15 b' Test that the internal linear merging wo'
366
366
367 $ hg update -q -C 2
367 $ hg update -q -C 2
368 $ hg strip 3 4
368 $ hg strip 3 4
369 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9530e27857f7-backup.hg (glob)
369 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9530e27857f7-2e7b195d-backup.hg (glob)
370 $ mv .hg/strip-backup/9530e27857f7-backup.hg $TESTTMP
370 $ mv .hg/strip-backup/9530e27857f7-2e7b195d-backup.hg $TESTTMP
371
371
372 (internal linear merging at "hg pull --update")
372 (internal linear merging at "hg pull --update")
373
373
374 $ echo 'large1 for linear merge (conflict)' > large1
374 $ echo 'large1 for linear merge (conflict)' > large1
375 $ echo 'large2 for linear merge (conflict with normal file)' > large2
375 $ echo 'large2 for linear merge (conflict with normal file)' > large2
376 $ hg pull --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-backup.hg
376 $ hg pull --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg
377 pulling from $TESTTMP/9530e27857f7-backup.hg (glob)
377 pulling from $TESTTMP/9530e27857f7-2e7b195d-backup.hg (glob)
378 searching for changes
378 searching for changes
379 adding changesets
379 adding changesets
380 adding manifests
380 adding manifests
@@ -408,7 +408,7 b' Test that the internal linear merging wo'
408
408
409 $ echo 'large1 for linear merge (conflict)' > large1
409 $ echo 'large1 for linear merge (conflict)' > large1
410 $ echo 'large2 for linear merge (conflict with normal file)' > large2
410 $ echo 'large2 for linear merge (conflict with normal file)' > large2
411 $ hg unbundle --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-backup.hg
411 $ hg unbundle --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg
412 adding changesets
412 adding changesets
413 adding manifests
413 adding manifests
414 adding file changes
414 adding file changes
@@ -1188,7 +1188,7 b' rebased or not.'
1188 Invoking status precommit hook
1188 Invoking status precommit hook
1189 M sub/normal4
1189 M sub/normal4
1190 M sub2/large6
1190 M sub2/large6
1191 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
1191 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-dd1d9f80-backup.hg (glob)
1192 $ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
1192 $ [ -f .hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 ]
1193 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1193 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1194 9:598410d3eb9a modify normal file largefile in repo d
1194 9:598410d3eb9a modify normal file largefile in repo d
@@ -1246,7 +1246,7 b' rebased or not.'
1246 Invoking status precommit hook
1246 Invoking status precommit hook
1247 M sub/normal4
1247 M sub/normal4
1248 M sub2/large6
1248 M sub2/large6
1249 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
1249 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-dd1d9f80-backup.hg (glob)
1250 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1250 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1251 9:598410d3eb9a modify normal file largefile in repo d
1251 9:598410d3eb9a modify normal file largefile in repo d
1252 8:a381d2c8c80e modify normal file and largefile in repo b
1252 8:a381d2c8c80e modify normal file and largefile in repo b
@@ -801,7 +801,7 b' strip with local changes, should complai'
801
801
802 $ hg strip -f tip
802 $ hg strip -f tip
803 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
803 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
804 saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
804 saved backup bundle to $TESTTMP/b/.hg/strip-backup/770eb8fce608-0ddcae0f-backup.hg (glob)
805 $ cd ..
805 $ cd ..
806
806
807
807
@@ -72,7 +72,7 b' Conflicting rebase:'
72 Abort:
72 Abort:
73
73
74 $ hg rebase --abort
74 $ hg rebase --abort
75 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-backup.hg (glob)
75 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3e046f2ecedb-6beef7d5-backup.hg (glob)
76 rebase aborted
76 rebase aborted
77
77
78 $ hg tglog
78 $ hg tglog
@@ -75,7 +75,7 b' Test deleting divergent bookmarks from d'
75
75
76 $ hg rebase -s Y -d 3
76 $ hg rebase -s Y -d 3
77 rebasing 2:49cb3485fa0c "C" (Y Z)
77 rebasing 2:49cb3485fa0c "C" (Y Z)
78 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-backup.hg (glob)
78 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-backup.hg (glob)
79
79
80 $ hg tglog
80 $ hg tglog
81 @ 3: 'C' bookmarks: Y Z
81 @ 3: 'C' bookmarks: Y Z
@@ -97,7 +97,7 b' Do not try to keep active but deleted di'
97
97
98 $ hg rebase -s W -d .
98 $ hg rebase -s W -d .
99 rebasing 3:41acb9dca9eb "D" (tip W)
99 rebasing 3:41acb9dca9eb "D" (tip W)
100 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-backup.hg (glob)
100 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/41acb9dca9eb-b35a6a63-backup.hg (glob)
101
101
102 $ hg bookmarks
102 $ hg bookmarks
103 W 3:0d3554f74897
103 W 3:0d3554f74897
@@ -116,7 +116,7 b' Keep bookmarks to the correct rebased ch'
116 $ hg rebase -s 1 -d 3
116 $ hg rebase -s 1 -d 3
117 rebasing 1:6c81ed0049f8 "B" (X)
117 rebasing 1:6c81ed0049f8 "B" (X)
118 rebasing 2:49cb3485fa0c "C" (Y Z)
118 rebasing 2:49cb3485fa0c "C" (Y Z)
119 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-backup.hg (glob)
119 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg (glob)
120
120
121 $ hg tglog
121 $ hg tglog
122 @ 3: 'C' bookmarks: Y Z
122 @ 3: 'C' bookmarks: Y Z
@@ -139,7 +139,7 b' Keep active bookmark on the correct chan'
139 $ hg rebase -d W
139 $ hg rebase -d W
140 rebasing 1:6c81ed0049f8 "B" (X)
140 rebasing 1:6c81ed0049f8 "B" (X)
141 rebasing 2:49cb3485fa0c "C" (Y Z)
141 rebasing 2:49cb3485fa0c "C" (Y Z)
142 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-backup.hg (glob)
142 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg (glob)
143
143
144 $ hg tglog
144 $ hg tglog
145 o 3: 'C' bookmarks: Y Z
145 o 3: 'C' bookmarks: Y Z
@@ -179,7 +179,7 b' rebase --continue with bookmarks present'
179 (no more unresolved files)
179 (no more unresolved files)
180 $ hg rebase --continue
180 $ hg rebase --continue
181 rebasing 3:3d5fa227f4b5 "C" (Y Z)
181 rebasing 3:3d5fa227f4b5 "C" (Y Z)
182 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob)
182 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-backup.hg (glob)
183 $ hg tglog
183 $ hg tglog
184 @ 4: 'C' bookmarks: Y Z
184 @ 4: 'C' bookmarks: Y Z
185 |
185 |
@@ -209,4 +209,4 b' as --rev arguments (issue3950)'
209 rebasing 5:345c90f326a4 "bisect"
209 rebasing 5:345c90f326a4 "bisect"
210 rebasing 6:f677a2907404 "bisect2"
210 rebasing 6:f677a2907404 "bisect2"
211 rebasing 7:325c16001345 "bisect3" (tip bisect)
211 rebasing 7:325c16001345 "bisect3" (tip bisect)
212 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-backup.hg (glob)
212 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-b4840586-backup.hg (glob)
@@ -107,7 +107,7 b' Rebase part of branch2 (5-6) onto branch'
107 $ hg rebase -s 5 -d 8
107 $ hg rebase -s 5 -d 8
108 rebasing 5:635859577d0b "D"
108 rebasing 5:635859577d0b "D"
109 rebasing 6:5097051d331d "E"
109 rebasing 6:5097051d331d "E"
110 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-backup.hg (glob)
110 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/635859577d0b-89160bff-backup.hg (glob)
111
111
112 $ hg branches
112 $ hg branches
113 branch3 8:466cdfb14b62
113 branch3 8:466cdfb14b62
@@ -169,7 +169,7 b' Rebase head of branch3 (8) onto branch2 '
169
169
170 $ hg rebase -s 8 -d 6
170 $ hg rebase -s 8 -d 6
171 rebasing 8:4666b71e8e32 "F" (tip)
171 rebasing 8:4666b71e8e32 "F" (tip)
172 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-backup.hg (glob)
172 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/4666b71e8e32-fc1c4e96-backup.hg (glob)
173
173
174 $ hg branches
174 $ hg branches
175 branch2 8:6b4bdc1b5ac0
175 branch2 8:6b4bdc1b5ac0
@@ -236,7 +236,7 b' Rebase entire branch3 (7-8) onto branch2'
236 rebasing 7:653b9feb4616 "branch3"
236 rebasing 7:653b9feb4616 "branch3"
237 note: rebase of 7:653b9feb4616 created no changes to commit
237 note: rebase of 7:653b9feb4616 created no changes to commit
238 rebasing 8:4666b71e8e32 "F" (tip)
238 rebasing 8:4666b71e8e32 "F" (tip)
239 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-backup.hg (glob)
239 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/653b9feb4616-3c88de16-backup.hg (glob)
240
240
241 $ hg branches
241 $ hg branches
242 branch2 7:6b4bdc1b5ac0
242 branch2 7:6b4bdc1b5ac0
@@ -273,7 +273,7 b' update the branch cache.'
273
273
274 $ hg strip 2
274 $ hg strip 2
275 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
275 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
276 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-backup.hg (glob)
276 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/0a03079c47fd-11b7c407-backup.hg (glob)
277
277
278 $ hg tglog
278 $ hg tglog
279 o 3: 'C' branch2
279 o 3: 'C' branch2
@@ -334,7 +334,7 b' the same as branches remaining.'
334
334
335 $ hg strip 2
335 $ hg strip 2
336 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
336 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
337 saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-backup.hg (glob)
337 saved backup bundle to $TESTTMP/a3/b/.hg/strip-backup/a5b4b27ed7b4-a3b6984e-backup.hg (glob)
338
338
339 $ hg theads
339 $ hg theads
340 1: 'branch2' branch2
340 1: 'branch2' branch2
@@ -379,14 +379,14 b' Try both orders.'
379
379
380 $ hg strip 3 4
380 $ hg strip 3 4
381 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
381 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
382 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-backup.hg (glob)
382 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/67a385d4e6f2-b9243789-backup.hg (glob)
383
383
384 $ hg theads
384 $ hg theads
385 2: 'C'
385 2: 'C'
386
386
387 $ hg strip 2 1
387 $ hg strip 2 1
388 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
388 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
389 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-backup.hg (glob)
389 saved backup bundle to $TESTTMP/a3/c/.hg/strip-backup/6c81ed0049f8-a687065f-backup.hg (glob)
390
390
391 $ hg theads
391 $ hg theads
392 0: 'A'
392 0: 'A'
@@ -485,4 +485,4 b' Turn most changeset public'
485 HGEDITFORM=rebase.merge
485 HGEDITFORM=rebase.merge
486 rebasing 8:326cfedc031c "I" (tip)
486 rebasing 8:326cfedc031c "I" (tip)
487 HGEDITFORM=rebase.normal
487 HGEDITFORM=rebase.normal
488 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-backup.hg (glob)
488 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/361a99976cc9-35e980d0-backup.hg (glob)
@@ -138,7 +138,7 b' Solve the conflict and go on:'
138 (no more unresolved files)
138 (no more unresolved files)
139 $ hg rebase --continue
139 $ hg rebase --continue
140 rebasing 5:01e6ebbd8272 "F" (tip)
140 rebasing 5:01e6ebbd8272 "F" (tip)
141 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-backup.hg (glob)
141 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-backup.hg (glob)
142
142
143 $ hg tglog
143 $ hg tglog
144 @ 5:draft 'F' notdefault
144 @ 5:draft 'F' notdefault
@@ -81,7 +81,7 b' Rebasing B onto H and collapsing changes'
81 HG: added C
81 HG: added C
82 HG: added D
82 HG: added D
83 ====
83 ====
84 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
84 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
85
85
86 $ hg tglogp
86 $ hg tglogp
87 @ 5:secret 'Collapsed revision
87 @ 5:secret 'Collapsed revision
@@ -123,7 +123,7 b' Rebasing E onto H:'
123 note: rebase of 4:9520eea781bc created no changes to commit
123 note: rebase of 4:9520eea781bc created no changes to commit
124 rebasing 6:eea13746799a "G"
124 rebasing 6:eea13746799a "G"
125 note: rebase of 6:eea13746799a created no changes to commit
125 note: rebase of 6:eea13746799a created no changes to commit
126 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-backup.hg (glob)
126 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/9520eea781bc-fcd8edd4-backup.hg (glob)
127
127
128 $ hg tglog
128 $ hg tglog
129 o 6: 'Collapsed revision
129 o 6: 'Collapsed revision
@@ -168,7 +168,7 b' Rebasing G onto H with custom message:'
168 rebasing 6:eea13746799a "G"
168 rebasing 6:eea13746799a "G"
169 note: rebase of 6:eea13746799a created no changes to commit
169 note: rebase of 6:eea13746799a created no changes to commit
170 HGEDITFORM=rebase.collapse
170 HGEDITFORM=rebase.collapse
171 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-backup.hg (glob)
171 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-backup.hg (glob)
172
172
173 $ hg tglog
173 $ hg tglog
174 o 6: 'custom message'
174 o 6: 'custom message'
@@ -281,7 +281,7 b' Rebase and collapse - E onto H:'
281 note: rebase of 5:7f219660301f created no changes to commit
281 note: rebase of 5:7f219660301f created no changes to commit
282 rebasing 6:c772a8b2dc17 "G"
282 rebasing 6:c772a8b2dc17 "G"
283 note: rebase of 6:c772a8b2dc17 created no changes to commit
283 note: rebase of 6:c772a8b2dc17 created no changes to commit
284 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-backup.hg (glob)
284 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/8a5212ebc852-75046b61-backup.hg (glob)
285
285
286 $ hg tglog
286 $ hg tglog
287 o 5: 'Collapsed revision
287 o 5: 'Collapsed revision
@@ -330,7 +330,7 b' We keep it the test this way in case new'
330 c65502d4178782309ce0574c5ae6ee9485a9bafa o default
330 c65502d4178782309ce0574c5ae6ee9485a9bafa o default
331
331
332 $ hg strip 4
332 $ hg strip 4
333 saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-backup.hg (glob)
333 saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-75046b61-backup.hg (glob)
334
334
335 $ cat $TESTTMP/b2/.hg/cache/branch2-served
335 $ cat $TESTTMP/b2/.hg/cache/branch2-served
336 c65502d4178782309ce0574c5ae6ee9485a9bafa 4
336 c65502d4178782309ce0574c5ae6ee9485a9bafa 4
@@ -438,7 +438,7 b' Rebase and collapse - E onto I:'
438 note: rebase of 6:55a44ad28289 created no changes to commit
438 note: rebase of 6:55a44ad28289 created no changes to commit
439 rebasing 7:417d3b648079 "H"
439 rebasing 7:417d3b648079 "H"
440 note: rebase of 7:417d3b648079 created no changes to commit
440 note: rebase of 7:417d3b648079 created no changes to commit
441 saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-backup.hg (glob)
441 saved backup bundle to $TESTTMP/c1/.hg/strip-backup/8a5212ebc852-f95d0879-backup.hg (glob)
442
442
443 $ hg tglog
443 $ hg tglog
444 o 5: 'Collapsed revision
444 o 5: 'Collapsed revision
@@ -535,7 +535,7 b' Rebase and collapse - B onto F:'
535 note: rebase of 3:7bbcd6078bcc created no changes to commit
535 note: rebase of 3:7bbcd6078bcc created no changes to commit
536 rebasing 4:0a42590ed746 "E"
536 rebasing 4:0a42590ed746 "E"
537 note: rebase of 4:0a42590ed746 created no changes to commit
537 note: rebase of 4:0a42590ed746 created no changes to commit
538 saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-backup.hg (glob)
538 saved backup bundle to $TESTTMP/d1/.hg/strip-backup/27547f69f254-9a3f7d92-backup.hg (glob)
539
539
540 $ hg tglog
540 $ hg tglog
541 o 2: 'Collapsed revision
541 o 2: 'Collapsed revision
@@ -621,7 +621,7 b' Interactions between collapse and keepbr'
621 $ hg rebase -s 5 -d 4
621 $ hg rebase -s 5 -d 4
622 rebasing 5:fbfb97b1089a "E" (tip)
622 rebasing 5:fbfb97b1089a "E" (tip)
623 note: rebase of 5:fbfb97b1089a created no changes to commit
623 note: rebase of 5:fbfb97b1089a created no changes to commit
624 saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-backup.hg (glob)
624 saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-backup.hg (glob)
625 $ hg tglog
625 $ hg tglog
626 @ 4: 'E'
626 @ 4: 'E'
627 |
627 |
@@ -681,7 +681,7 b' Rebase, collapse and copies'
681 merging f and c to c
681 merging f and c to c
682 merging e and g to g
682 merging e and g to g
683 note: rebase of 3:338e84e2e558 created no changes to commit
683 note: rebase of 3:338e84e2e558 created no changes to commit
684 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-backup.hg (glob)
684 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/6e7340ee38c0-ef8ef003-backup.hg (glob)
685 $ hg st
685 $ hg st
686 $ hg st --copies --change tip
686 $ hg st --copies --change tip
687 A d
687 A d
@@ -724,7 +724,7 b' Test collapsing in place'
724 note: rebase of 1:1352765a01d4 created no changes to commit
724 note: rebase of 1:1352765a01d4 created no changes to commit
725 rebasing 2:64b456429f67 "Collapsed revision" (tip)
725 rebasing 2:64b456429f67 "Collapsed revision" (tip)
726 note: rebase of 2:64b456429f67 created no changes to commit
726 note: rebase of 2:64b456429f67 created no changes to commit
727 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-backup.hg (glob)
727 saved backup bundle to $TESTTMP/copies/.hg/strip-backup/1352765a01d4-45a352ea-backup.hg (glob)
728 $ hg st --change tip --copies
728 $ hg st --change tip --copies
729 M a
729 M a
730 M c
730 M c
@@ -783,7 +783,7 b' Test stripping a revision with another c'
783
783
784 $ hg strip 2
784 $ hg strip 2
785 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
785 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
786 saved backup bundle to $TESTTMP/f/.hg/strip-backup/c5cefa58fd55-backup.hg (glob)
786 saved backup bundle to $TESTTMP/f/.hg/strip-backup/c5cefa58fd55-629429f4-backup.hg (glob)
787
787
788 $ hg tglog
788 $ hg tglog
789 o 1: 'B'
789 o 1: 'B'
@@ -818,7 +818,7 b' Test collapsing changes that add then re'
818 note: rebase of 1:6d8d9f24eec3 created no changes to commit
818 note: rebase of 1:6d8d9f24eec3 created no changes to commit
819 rebasing 2:1cc73eca5ecc "b" (tip foo)
819 rebasing 2:1cc73eca5ecc "b" (tip foo)
820 note: rebase of 2:1cc73eca5ecc created no changes to commit
820 note: rebase of 2:1cc73eca5ecc created no changes to commit
821 saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-backup.hg (glob)
821 saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/6d8d9f24eec3-77d3b6e2-backup.hg (glob)
822 $ hg log -G --template "{rev}: '{desc}' {bookmarks}"
822 $ hg log -G --template "{rev}: '{desc}' {bookmarks}"
823 @ 1: 'collapsed' foo
823 @ 1: 'collapsed' foo
824 |
824 |
@@ -86,7 +86,7 b' Conclude rebase:'
86 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
86 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
87 rebasing 4:46f0b057b5c0 "L2"
87 rebasing 4:46f0b057b5c0 "L2"
88 rebasing 5:8029388f38dc "L3" (mybook)
88 rebasing 5:8029388f38dc "L3" (mybook)
89 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-backup.hg (glob)
89 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-backup.hg (glob)
90
90
91 $ hg tglog
91 $ hg tglog
92 @ 5:secret 'L3' mybook
92 @ 5:secret 'L3' mybook
@@ -292,7 +292,7 b' Check that the right ancestors is used w'
292 bundling: 2/3 manifests (66.67%)
292 bundling: 2/3 manifests (66.67%)
293 bundling: 3/3 manifests (100.00%)
293 bundling: 3/3 manifests (100.00%)
294 bundling: f1.txt 1/1 files (100.00%)
294 bundling: f1.txt 1/1 files (100.00%)
295 saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-backup.hg (glob)
295 saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-backup.hg (glob)
296 3 changesets found
296 3 changesets found
297 list of changesets:
297 list of changesets:
298 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
298 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
@@ -49,7 +49,7 b' Rebasing D onto H detaching from C:'
49 $ hg phase --force --secret 3
49 $ hg phase --force --secret 3
50 $ hg rebase -s 3 -d 7
50 $ hg rebase -s 3 -d 7
51 rebasing 3:32af7686d403 "D"
51 rebasing 3:32af7686d403 "D"
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-backup.hg (glob)
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-backup.hg (glob)
53
53
54 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
54 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
55 o 7:secret 'D'
55 o 7:secret 'D'
@@ -102,7 +102,7 b' Rebasing C onto H detaching from B:'
102 $ hg rebase -s 2 -d 7
102 $ hg rebase -s 2 -d 7
103 rebasing 2:5fddd98957c8 "C"
103 rebasing 2:5fddd98957c8 "C"
104 rebasing 3:32af7686d403 "D"
104 rebasing 3:32af7686d403 "D"
105 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
105 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
106
106
107 $ hg tglog
107 $ hg tglog
108 o 7: 'D'
108 o 7: 'D'
@@ -157,7 +157,7 b' Rebasing B onto H using detach (same as '
157 rebasing 1:42ccdea3bb16 "B"
157 rebasing 1:42ccdea3bb16 "B"
158 rebasing 2:5fddd98957c8 "C"
158 rebasing 2:5fddd98957c8 "C"
159 rebasing 3:32af7686d403 "D"
159 rebasing 3:32af7686d403 "D"
160 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
160 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
161
161
162 $ hg tglog
162 $ hg tglog
163 o 7: 'D'
163 o 7: 'D'
@@ -215,7 +215,7 b' Rebasing C onto H detaching from B and c'
215 note: rebase of 2:5fddd98957c8 created no changes to commit
215 note: rebase of 2:5fddd98957c8 created no changes to commit
216 rebasing 3:32af7686d403 "D"
216 rebasing 3:32af7686d403 "D"
217 note: rebase of 3:32af7686d403 created no changes to commit
217 note: rebase of 3:32af7686d403 created no changes to commit
218 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
218 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
219
219
220 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
220 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
221 o 6:secret 'Collapsed revision
221 o 6:secret 'Collapsed revision
@@ -277,7 +277,7 b' Rebasing across null as ancestor'
277 rebasing 1:42ccdea3bb16 "B"
277 rebasing 1:42ccdea3bb16 "B"
278 rebasing 2:5fddd98957c8 "C"
278 rebasing 2:5fddd98957c8 "C"
279 rebasing 3:32af7686d403 "D"
279 rebasing 3:32af7686d403 "D"
280 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
280 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
281
281
282 $ hg tglog
282 $ hg tglog
283 o 8: 'D'
283 o 8: 'D'
@@ -302,7 +302,7 b' Rebasing across null as ancestor'
302 $ hg rebase -d 5 -s 7
302 $ hg rebase -d 5 -s 7
303 rebasing 7:13547172c9c0 "C"
303 rebasing 7:13547172c9c0 "C"
304 rebasing 8:4e27a76c371a "D" (tip)
304 rebasing 8:4e27a76c371a "D" (tip)
305 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob)
305 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-35685ded-backup.hg (glob)
306 $ hg tglog
306 $ hg tglog
307 o 8: 'D'
307 o 8: 'D'
308 |
308 |
@@ -346,7 +346,7 b' Verify that target is not selected as ex'
346 note: rebase of 9:5d7b11f5fb97 created no changes to commit
346 note: rebase of 9:5d7b11f5fb97 created no changes to commit
347 rebasing 10:9427d4d5af81 "J" (tip)
347 rebasing 10:9427d4d5af81 "J" (tip)
348 note: rebase of 10:9427d4d5af81 created no changes to commit
348 note: rebase of 10:9427d4d5af81 created no changes to commit
349 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-backup.hg (glob)
349 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-c2111e9d-backup.hg (glob)
350
350
351 $ hg tglog
351 $ hg tglog
352 @ 8: 'Collapsed revision
352 @ 8: 'Collapsed revision
@@ -400,7 +400,7 b' Ensure --continue restores a correct sta'
400 $ hg rebase -c
400 $ hg rebase -c
401 rebasing 8:6215fafa5447 "H2" (tip)
401 rebasing 8:6215fafa5447 "H2" (tip)
402 note: rebase of 8:6215fafa5447 created no changes to commit
402 note: rebase of 8:6215fafa5447 created no changes to commit
403 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob)
403 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-5804ebd5-backup.hg (glob)
404 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
404 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
405 @ 7:draft 'H'
405 @ 7:draft 'H'
406 |
406 |
@@ -53,7 +53,7 b' Rebase with no arguments - single revisi'
53
53
54 $ hg rebase
54 $ hg rebase
55 rebasing 2:87c180a611f2 "l1"
55 rebasing 2:87c180a611f2 "l1"
56 saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-backup.hg (glob)
56 saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-backup.hg (glob)
57
57
58 $ hg tglog
58 $ hg tglog
59 @ 4: 'l1'
59 @ 4: 'l1'
@@ -113,7 +113,7 b' Rebase with no arguments - single revisi'
113 $ hg rebase
113 $ hg rebase
114 rebasing 2:87c180a611f2 "l1"
114 rebasing 2:87c180a611f2 "l1"
115 rebasing 3:1ac923b736ef "l2"
115 rebasing 3:1ac923b736ef "l2"
116 saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-backup.hg (glob)
116 saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-backup.hg (glob)
117
117
118 $ hg tglog
118 $ hg tglog
119 @ 4: 'l2'
119 @ 4: 'l2'
@@ -72,7 +72,7 b' already has one local mq patch'
72 284 (manifests)
72 284 (manifests)
73 109 p0
73 109 p0
74 109 p1
74 109 p1
75 saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-backup.hg (glob)
75 saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-backup.hg (glob)
76 2 changesets found
76 2 changesets found
77 uncompressed size of bundle content:
77 uncompressed size of bundle content:
78 399 (changelog)
78 399 (changelog)
@@ -163,7 +163,7 b' already has one local mq patch'
163 rebasing 5:681a378595ba "r5" (5.diff)
163 rebasing 5:681a378595ba "r5" (5.diff)
164 rebasing 6:512a1f24768b "r6" (6.diff qtip)
164 rebasing 6:512a1f24768b "r6" (6.diff qtip)
165 note: rebase of 6:512a1f24768b created no changes to commit
165 note: rebase of 6:512a1f24768b created no changes to commit
166 saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-backup.hg (glob)
166 saved backup bundle to $TESTTMP/b/.hg/strip-backup/b4bffa6e4776-b9bfb84d-backup.hg (glob)
167
167
168 $ hg tglog
168 $ hg tglog
169 @ 8: 'r5' tags: 5.diff qtip tip
169 @ 8: 'r5' tags: 5.diff qtip tip
@@ -88,7 +88,7 b' Fix the 2nd conflict:'
88 $ hg rebase -c
88 $ hg rebase -c
89 already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c
89 already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c
90 rebasing 3:929394423cd3 "P1" (f2.patch qtip)
90 rebasing 3:929394423cd3 "P1" (f2.patch qtip)
91 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-backup.hg (glob)
91 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3504f44bffc0-30595b40-backup.hg (glob)
92
92
93 $ hg tglog
93 $ hg tglog
94 @ 3: 'P1' tags: f2.patch qtip tip
94 @ 3: 'P1' tags: f2.patch qtip tip
@@ -205,7 +205,7 b' Rebase the applied mq patches:'
205 $ hg rebase -s 2 -d 1
205 $ hg rebase -s 2 -d 1
206 rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase)
206 rebasing 2:0c587ffcb480 "P0 (git)" (f_git.patch qbase)
207 rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip)
207 rebasing 3:c7f18665e4bc "P1" (f.patch qtip tip)
208 saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-backup.hg (glob)
208 saved backup bundle to $TESTTMP/a/.hg/strip-backup/0c587ffcb480-0ea5695f-backup.hg (glob)
209
209
210 $ hg qci -m 'save patch state'
210 $ hg qci -m 'save patch state'
211
211
@@ -73,7 +73,7 b' Branch name containing a dash (issue3181'
73 rebasing 6:eea13746799a "G"
73 rebasing 6:eea13746799a "G"
74 rebasing 7:02de42196ebe "H"
74 rebasing 7:02de42196ebe "H"
75 rebasing 9:cb039b7cae8e "dev-two named branch" (tip)
75 rebasing 9:cb039b7cae8e "dev-two named branch" (tip)
76 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-backup.hg (glob)
76 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-backup.hg (glob)
77
77
78 $ hg tglog
78 $ hg tglog
79 @ 9: 'dev-two named branch' dev-two
79 @ 9: 'dev-two named branch' dev-two
@@ -103,7 +103,7 b' Branch name containing a dash (issue3181'
103 rebasing 7:4b988a958030 "G"
103 rebasing 7:4b988a958030 "G"
104 rebasing 8:31d0e4ba75e6 "H"
104 rebasing 8:31d0e4ba75e6 "H"
105 rebasing 9:9e70cd31750f "dev-two named branch" (tip)
105 rebasing 9:9e70cd31750f "dev-two named branch" (tip)
106 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-backup.hg (glob)
106 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-backup.hg (glob)
107
107
108 $ hg tglog
108 $ hg tglog
109 @ 8: 'dev-two named branch' dev-two
109 @ 8: 'dev-two named branch' dev-two
@@ -157,7 +157,7 b' Branch name containing a dash (issue3181'
157 rebasing 6:63b4f9c788a1 "G"
157 rebasing 6:63b4f9c788a1 "G"
158 rebasing 7:87861e68abd3 "H"
158 rebasing 7:87861e68abd3 "H"
159 rebasing 8:ec00d4e0efca "dev-two named branch"
159 rebasing 8:ec00d4e0efca "dev-two named branch"
160 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/77854864208c-backup.hg (glob)
160 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/77854864208c-74d59436-backup.hg (glob)
161
161
162 $ hg tglog
162 $ hg tglog
163 o 9: 'dev-two named branch' dev-two
163 o 9: 'dev-two named branch' dev-two
@@ -187,7 +187,7 b' Branch name containing a dash (issue3181'
187 rebasing 7:471695f5257d "G"
187 rebasing 7:471695f5257d "G"
188 rebasing 8:8382a539a2df "H"
188 rebasing 8:8382a539a2df "H"
189 rebasing 9:11f718458b32 "dev-two named branch" (tip)
189 rebasing 9:11f718458b32 "dev-two named branch" (tip)
190 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-backup.hg (glob)
190 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-177f3c5c-backup.hg (glob)
191
191
192 $ hg tglog
192 $ hg tglog
193 o 8: 'dev-two named branch' dev-two
193 o 8: 'dev-two named branch' dev-two
@@ -215,7 +215,7 b' Rebasing descendant onto ancestor across'
215 rebasing 1:42ccdea3bb16 "B"
215 rebasing 1:42ccdea3bb16 "B"
216 rebasing 2:5fddd98957c8 "C"
216 rebasing 2:5fddd98957c8 "C"
217 rebasing 3:32af7686d403 "D"
217 rebasing 3:32af7686d403 "D"
218 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
218 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
219
219
220 $ hg tglog
220 $ hg tglog
221 o 8: 'D'
221 o 8: 'D'
@@ -245,7 +245,7 b' Rebasing descendant onto ancestor across'
245 rebasing 6:580fcd9fd48f "B"
245 rebasing 6:580fcd9fd48f "B"
246 rebasing 7:32aba0402ed2 "C"
246 rebasing 7:32aba0402ed2 "C"
247 rebasing 8:e4787b575338 "D" (tip)
247 rebasing 8:e4787b575338 "D" (tip)
248 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32d3b0de7f37-backup.hg (glob)
248 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32d3b0de7f37-c37815ca-backup.hg (glob)
249
249
250 $ hg tglog
250 $ hg tglog
251 o 8: 'D'
251 o 8: 'D'
@@ -280,7 +280,7 b' Reopen branch by rebase'
280 rebasing 6:81e55225e95d "B"
280 rebasing 6:81e55225e95d "B"
281 rebasing 7:09eda3dc3195 "C"
281 rebasing 7:09eda3dc3195 "C"
282 rebasing 8:31298fc9d159 "D"
282 rebasing 8:31298fc9d159 "D"
283 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/86693275b2ef-backup.hg (glob)
283 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/86693275b2ef-f9fcf4e2-backup.hg (glob)
284
284
285 $ cd ..
285 $ cd ..
286
286
@@ -335,7 +335,7 b" rebase 'b1' on top of the tip of the bra"
335 $ hg up -qr 1
335 $ hg up -qr 1
336 $ hg rebase
336 $ hg rebase
337 rebasing 1:40039acb7ca5 "b1"
337 rebasing 1:40039acb7ca5 "b1"
338 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-backup.hg (glob)
338 saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-backup.hg (glob)
339 $ hg tglog
339 $ hg tglog
340 @ 3: 'b1' b
340 @ 3: 'b1' b
341 |
341 |
@@ -42,7 +42,7 b''
42 merging a
42 merging a
43 rebasing 2:30ae917c0e4f "C"
43 rebasing 2:30ae917c0e4f "C"
44 merging a
44 merging a
45 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-backup.hg (glob)
45 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0f4f7cb4f549-82b3b163-backup.hg (glob)
46
46
47 $ hg tglog
47 $ hg tglog
48 o 3: 'C'
48 o 3: 'C'
@@ -134,7 +134,7 b' Full rebase all the way back from branch'
134 remote changed f-default which local deleted
134 remote changed f-default which local deleted
135 use (c)hanged version or leave (d)eleted? c
135 use (c)hanged version or leave (d)eleted? c
136 rebasing 6:9455ee510502 "dev: merge default"
136 rebasing 6:9455ee510502 "dev: merge default"
137 saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-backup.hg (glob)
137 saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-backup.hg (glob)
138 $ hg tglog
138 $ hg tglog
139 o 6: 'dev: merge default'
139 o 6: 'dev: merge default'
140 |
140 |
@@ -161,7 +161,7 b' Grafty cherry picking rebasing:'
161 remote changed f-default which local deleted
161 remote changed f-default which local deleted
162 use (c)hanged version or leave (d)eleted? c
162 use (c)hanged version or leave (d)eleted? c
163 rebasing 6:9455ee510502 "dev: merge default"
163 rebasing 6:9455ee510502 "dev: merge default"
164 saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-backup.hg (glob)
164 saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-backup.hg (glob)
165 $ hg tglog
165 $ hg tglog
166 o 7: 'dev: merge default'
166 o 7: 'dev: merge default'
167 |
167 |
@@ -233,7 +233,7 b' Test order of parents of rebased merged '
233
233
234 $ hg rebase -r 4 -d 2
234 $ hg rebase -r 4 -d 2
235 rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor"
235 rebasing 4:6990226659be "merge p1 3=outside p2 1=ancestor"
236 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-backup.hg (glob)
236 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-4d67a0d3-backup.hg (glob)
237 $ hg tip
237 $ hg tip
238 changeset: 5:cca50676b1c5
238 changeset: 5:cca50676b1c5
239 tag: tip
239 tag: tip
@@ -245,7 +245,7 b' Test order of parents of rebased merged '
245
245
246 $ hg rebase -r 4 -d 2
246 $ hg rebase -r 4 -d 2
247 rebasing 4:a57575f79074 "merge p1 1=ancestor p2 3=outside"
247 rebasing 4:a57575f79074 "merge p1 1=ancestor p2 3=outside"
248 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-backup.hg (glob)
248 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-385426e5-backup.hg (glob)
249 $ hg tip
249 $ hg tip
250 changeset: 5:f9daf77ffe76
250 changeset: 5:f9daf77ffe76
251 tag: tip
251 tag: tip
@@ -301,7 +301,7 b' rebase of merge of ancestors'
301 193 (changelog)
301 193 (changelog)
302 196 (manifests)
302 196 (manifests)
303 162 other
303 162 other
304 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-backup.hg (glob)
304 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-f46990e5-backup.hg (glob)
305 1 changesets found
305 1 changesets found
306 uncompressed size of bundle content:
306 uncompressed size of bundle content:
307 252 (changelog)
307 252 (changelog)
@@ -123,7 +123,7 b' Rebase with no arguments (from 3 onto 8)'
123 rebasing 1:42ccdea3bb16 "B"
123 rebasing 1:42ccdea3bb16 "B"
124 rebasing 2:5fddd98957c8 "C"
124 rebasing 2:5fddd98957c8 "C"
125 rebasing 3:32af7686d403 "D"
125 rebasing 3:32af7686d403 "D"
126 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
126 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
127
127
128 $ hg tglog
128 $ hg tglog
129 @ 8: 'D'
129 @ 8: 'D'
@@ -161,7 +161,7 b" Rebase with base == '.' => same as no ar"
161 rebasing 1:42ccdea3bb16 "B"
161 rebasing 1:42ccdea3bb16 "B"
162 rebasing 2:5fddd98957c8 "C"
162 rebasing 2:5fddd98957c8 "C"
163 rebasing 3:32af7686d403 "D"
163 rebasing 3:32af7686d403 "D"
164 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
164 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
165
165
166 $ hg tglog
166 $ hg tglog
167 @ 8: 'D'
167 @ 8: 'D'
@@ -194,7 +194,7 b' Rebase with dest == branch(.) => same as'
194 rebasing 1:42ccdea3bb16 "B"
194 rebasing 1:42ccdea3bb16 "B"
195 rebasing 2:5fddd98957c8 "C"
195 rebasing 2:5fddd98957c8 "C"
196 rebasing 3:32af7686d403 "D"
196 rebasing 3:32af7686d403 "D"
197 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
197 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
198
198
199 $ hg tglog
199 $ hg tglog
200 @ 8: 'D'
200 @ 8: 'D'
@@ -226,7 +226,7 b' Specify only source (from 2 onto 8):'
226 $ hg rebase --source 'desc("C")'
226 $ hg rebase --source 'desc("C")'
227 rebasing 2:5fddd98957c8 "C"
227 rebasing 2:5fddd98957c8 "C"
228 rebasing 3:32af7686d403 "D"
228 rebasing 3:32af7686d403 "D"
229 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
229 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
230
230
231 $ hg tglog
231 $ hg tglog
232 o 8: 'D'
232 o 8: 'D'
@@ -259,7 +259,7 b' Specify only dest (from 3 onto 6):'
259 rebasing 1:42ccdea3bb16 "B"
259 rebasing 1:42ccdea3bb16 "B"
260 rebasing 2:5fddd98957c8 "C"
260 rebasing 2:5fddd98957c8 "C"
261 rebasing 3:32af7686d403 "D"
261 rebasing 3:32af7686d403 "D"
262 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
262 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
263
263
264 $ hg tglog
264 $ hg tglog
265 @ 8: 'D'
265 @ 8: 'D'
@@ -292,7 +292,7 b' Specify only base (from 1 onto 8):'
292 rebasing 1:42ccdea3bb16 "B"
292 rebasing 1:42ccdea3bb16 "B"
293 rebasing 2:5fddd98957c8 "C"
293 rebasing 2:5fddd98957c8 "C"
294 rebasing 3:32af7686d403 "D"
294 rebasing 3:32af7686d403 "D"
295 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
295 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
296
296
297 $ hg tglog
297 $ hg tglog
298 o 8: 'D'
298 o 8: 'D'
@@ -324,7 +324,7 b' Specify source and dest (from 2 onto 7):'
324 $ hg rebase --source 2 --dest 7
324 $ hg rebase --source 2 --dest 7
325 rebasing 2:5fddd98957c8 "C"
325 rebasing 2:5fddd98957c8 "C"
326 rebasing 3:32af7686d403 "D"
326 rebasing 3:32af7686d403 "D"
327 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
327 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
328
328
329 $ hg tglog
329 $ hg tglog
330 o 8: 'D'
330 o 8: 'D'
@@ -357,7 +357,7 b' Specify base and dest (from 1 onto 7):'
357 rebasing 1:42ccdea3bb16 "B"
357 rebasing 1:42ccdea3bb16 "B"
358 rebasing 2:5fddd98957c8 "C"
358 rebasing 2:5fddd98957c8 "C"
359 rebasing 3:32af7686d403 "D"
359 rebasing 3:32af7686d403 "D"
360 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-backup.hg (glob)
360 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob)
361
361
362 $ hg tglog
362 $ hg tglog
363 o 8: 'D'
363 o 8: 'D'
@@ -389,7 +389,7 b' Specify only revs (from 2 onto 8)'
389 $ hg rebase --rev 'desc("C")::'
389 $ hg rebase --rev 'desc("C")::'
390 rebasing 2:5fddd98957c8 "C"
390 rebasing 2:5fddd98957c8 "C"
391 rebasing 3:32af7686d403 "D"
391 rebasing 3:32af7686d403 "D"
392 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
392 saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
393
393
394 $ hg tglog
394 $ hg tglog
395 o 8: 'D'
395 o 8: 'D'
@@ -439,7 +439,7 b' Test --tool parameter:'
439 $ hg rebase -s 2 -d 1 --tool internal:local
439 $ hg rebase -s 2 -d 1 --tool internal:local
440 rebasing 2:e4e3f3546619 "c2b" (tip)
440 rebasing 2:e4e3f3546619 "c2b" (tip)
441 note: rebase of 2:e4e3f3546619 created no changes to commit
441 note: rebase of 2:e4e3f3546619 created no changes to commit
442 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-backup.hg (glob)
442 saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob)
443
443
444 $ hg cat c2
444 $ hg cat c2
445 c2
445 c2
@@ -452,7 +452,7 b' Test --tool parameter:'
452
452
453 $ hg rebase -s 2 -d 1 --tool internal:other
453 $ hg rebase -s 2 -d 1 --tool internal:other
454 rebasing 2:e4e3f3546619 "c2b" (tip)
454 rebasing 2:e4e3f3546619 "c2b" (tip)
455 saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-backup.hg (glob)
455 saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob)
456
456
457 $ hg cat c2
457 $ hg cat c2
458 c2b
458 c2b
@@ -487,7 +487,7 b' Test --tool parameter:'
487 tool option will be ignored
487 tool option will be ignored
488 rebasing 2:e4e3f3546619 "c2b" (tip)
488 rebasing 2:e4e3f3546619 "c2b" (tip)
489 note: rebase of 2:e4e3f3546619 created no changes to commit
489 note: rebase of 2:e4e3f3546619 created no changes to commit
490 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-backup.hg (glob)
490 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob)
491
491
492 $ hg rebase -i
492 $ hg rebase -i
493 abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit')
493 abort: interactive history editing is supported by the 'histedit' extension (see 'hg help histedit')
@@ -54,7 +54,7 b' Now b has one revision to be pulled from'
54 adding file changes
54 adding file changes
55 added 1 changesets with 1 changes to 1 files (+1 heads)
55 added 1 changesets with 1 changes to 1 files (+1 heads)
56 rebasing 2:ff8d69a621f9 "L1"
56 rebasing 2:ff8d69a621f9 "L1"
57 saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-backup.hg (glob)
57 saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-backup.hg (glob)
58
58
59 $ hg tglog
59 $ hg tglog
60 @ 3: 'L1'
60 @ 3: 'L1'
@@ -151,7 +151,7 b' pull --rebase works when a specific revi'
151 adding file changes
151 adding file changes
152 added 2 changesets with 2 changes to 2 files
152 added 2 changesets with 2 changes to 2 files
153 rebasing 3:ff8d69a621f9 "L1"
153 rebasing 3:ff8d69a621f9 "L1"
154 saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-backup.hg (glob)
154 saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-backup.hg (glob)
155 $ hg tglog
155 $ hg tglog
156 @ 5: 'L1'
156 @ 5: 'L1'
157 |
157 |
@@ -61,7 +61,7 b' Rebase the revision containing the renam'
61
61
62 $ hg rebase -s 3 -d 2
62 $ hg rebase -s 3 -d 2
63 rebasing 3:73a3ee40125d "rename A" (tip)
63 rebasing 3:73a3ee40125d "rename A" (tip)
64 saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-backup.hg (glob)
64 saved backup bundle to $TESTTMP/a/.hg/strip-backup/73a3ee40125d-1d78ebcf-backup.hg (glob)
65
65
66 $ hg tglog
66 $ hg tglog
67 @ 3: 'rename A'
67 @ 3: 'rename A'
@@ -152,7 +152,7 b' Rebase the revision containing the copy:'
152
152
153 $ hg rebase -s 3 -d 2
153 $ hg rebase -s 3 -d 2
154 rebasing 3:0a8162ff18a8 "copy A" (tip)
154 rebasing 3:0a8162ff18a8 "copy A" (tip)
155 saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-backup.hg (glob)
155 saved backup bundle to $TESTTMP/b/.hg/strip-backup/0a8162ff18a8-dd06302a-backup.hg (glob)
156
156
157 $ hg tglog
157 $ hg tglog
158 @ 3: 'copy A'
158 @ 3: 'copy A'
@@ -236,7 +236,7 b' Test rebase across repeating renames:'
236
236
237 $ hg rebase -s 4 -d 3
237 $ hg rebase -s 4 -d 3
238 rebasing 4:b918d683b091 "Another unrelated change" (tip)
238 rebasing 4:b918d683b091 "Another unrelated change" (tip)
239 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-backup.hg (glob)
239 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/b918d683b091-3024bc57-backup.hg (glob)
240
240
241 $ hg diff --stat -c .
241 $ hg diff --stat -c .
242 unrelated.txt | 1 +
242 unrelated.txt | 1 +
@@ -287,7 +287,7 b' Rebase the copies on top of the unrelate'
287 rebasing 1:79d255d24ad2 "File b created as copy of a and modified"
287 rebasing 1:79d255d24ad2 "File b created as copy of a and modified"
288 rebasing 2:327f772bc074 "File c created as copy of b and modified"
288 rebasing 2:327f772bc074 "File c created as copy of b and modified"
289 rebasing 3:421b7e82bb85 "File d created as copy of c and modified"
289 rebasing 3:421b7e82bb85 "File d created as copy of c and modified"
290 saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-backup.hg (glob)
290 saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/79d255d24ad2-a2265555-backup.hg (glob)
291 $ hg update 4
291 $ hg update 4
292 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
292 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
293
293
@@ -317,7 +317,7 b' copy records collapse correctly.'
317 rebasing 4:dbb9ba033561 "File d created as copy of c and modified"
317 rebasing 4:dbb9ba033561 "File d created as copy of c and modified"
318 merging c and d to d
318 merging c and d to d
319 note: rebase of 4:dbb9ba033561 created no changes to commit
319 note: rebase of 4:dbb9ba033561 created no changes to commit
320 saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-backup.hg (glob)
320 saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-dde37595-backup.hg (glob)
321 $ hg co tip
321 $ hg co tip
322 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
322 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
323
323
@@ -61,7 +61,7 b' D onto H - simple rebase:'
61 HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com>
61 HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com>
62 HG: branch 'default'
62 HG: branch 'default'
63 HG: added D
63 HG: added D
64 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-backup.hg (glob)
64 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-backup.hg (glob)
65
65
66 $ hg tglog
66 $ hg tglog
67 o 7: 'D'
67 o 7: 'D'
@@ -91,7 +91,7 b' D onto F - intermediate point:'
91
91
92 $ HGEDITOR=cat hg rebase -s 3 -d 5
92 $ HGEDITOR=cat hg rebase -s 3 -d 5
93 rebasing 3:32af7686d403 "D"
93 rebasing 3:32af7686d403 "D"
94 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-backup.hg (glob)
94 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-6f7dface-backup.hg (glob)
95
95
96 $ hg tglog
96 $ hg tglog
97 o 7: 'D'
97 o 7: 'D'
@@ -122,7 +122,7 b' E onto H - skip of G:'
122 rebasing 4:9520eea781bc "E"
122 rebasing 4:9520eea781bc "E"
123 rebasing 6:eea13746799a "G"
123 rebasing 6:eea13746799a "G"
124 note: rebase of 6:eea13746799a created no changes to commit
124 note: rebase of 6:eea13746799a created no changes to commit
125 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-backup.hg (glob)
125 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-backup.hg (glob)
126
126
127 $ hg tglog
127 $ hg tglog
128 o 6: 'E'
128 o 6: 'E'
@@ -152,7 +152,7 b' F onto E - rebase of a branching point ('
152 rebasing 6:eea13746799a "G"
152 rebasing 6:eea13746799a "G"
153 note: rebase of 6:eea13746799a created no changes to commit
153 note: rebase of 6:eea13746799a created no changes to commit
154 rebasing 7:02de42196ebe "H" (tip)
154 rebasing 7:02de42196ebe "H" (tip)
155 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-backup.hg (glob)
155 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-backup.hg (glob)
156
156
157 $ hg tglog
157 $ hg tglog
158 @ 6: 'H'
158 @ 6: 'H'
@@ -179,7 +179,7 b' G onto H - merged revision having a pare'
179
179
180 $ hg rebase -s 6 -d 7
180 $ hg rebase -s 6 -d 7
181 rebasing 6:eea13746799a "G"
181 rebasing 6:eea13746799a "G"
182 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-backup.hg (glob)
182 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-883828ed-backup.hg (glob)
183
183
184 $ hg tglog
184 $ hg tglog
185 o 7: 'G'
185 o 7: 'G'
@@ -210,7 +210,7 b' F onto B - G maintains E as parent:'
210 rebasing 5:24b6387c8c8c "F"
210 rebasing 5:24b6387c8c8c "F"
211 rebasing 6:eea13746799a "G"
211 rebasing 6:eea13746799a "G"
212 rebasing 7:02de42196ebe "H" (tip)
212 rebasing 7:02de42196ebe "H" (tip)
213 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-backup.hg (glob)
213 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-backup.hg (glob)
214
214
215 $ hg tglog
215 $ hg tglog
216 @ 7: 'H'
216 @ 7: 'H'
@@ -282,7 +282,7 b' C onto A - rebase onto an ancestor:'
282 $ hg rebase -d 0 -s 2
282 $ hg rebase -d 0 -s 2
283 rebasing 2:5fddd98957c8 "C"
283 rebasing 2:5fddd98957c8 "C"
284 rebasing 3:32af7686d403 "D"
284 rebasing 3:32af7686d403 "D"
285 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
285 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob)
286 $ hg tglog
286 $ hg tglog
287 o 7: 'D'
287 o 7: 'D'
288 |
288 |
@@ -322,31 +322,31 b' Source phase greater or equal to destina'
322 5
322 5
323 $ hg rebase -s9 -d0
323 $ hg rebase -s9 -d0
324 rebasing 9:2b23e52411f4 "D" (tip)
324 rebasing 9:2b23e52411f4 "D" (tip)
325 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg (glob)
325 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-backup.hg (glob)
326 $ hg id -n # check we updated back to parent
326 $ hg id -n # check we updated back to parent
327 5
327 5
328 $ hg log --template "{phase}\n" -r 9
328 $ hg log --template "{phase}\n" -r 9
329 draft
329 draft
330 $ hg rebase -s9 -d1
330 $ hg rebase -s9 -d1
331 rebasing 9:2cb10d0cfc6c "D" (tip)
331 rebasing 9:2cb10d0cfc6c "D" (tip)
332 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg (glob)
332 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-backup.hg (glob)
333 $ hg log --template "{phase}\n" -r 9
333 $ hg log --template "{phase}\n" -r 9
334 draft
334 draft
335 $ hg phase --force --secret 9
335 $ hg phase --force --secret 9
336 $ hg rebase -s9 -d0
336 $ hg rebase -s9 -d0
337 rebasing 9:c5b12b67163a "D" (tip)
337 rebasing 9:c5b12b67163a "D" (tip)
338 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg (glob)
338 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-backup.hg (glob)
339 $ hg log --template "{phase}\n" -r 9
339 $ hg log --template "{phase}\n" -r 9
340 secret
340 secret
341 $ hg rebase -s9 -d1
341 $ hg rebase -s9 -d1
342 rebasing 9:2a0524f868ac "D" (tip)
342 rebasing 9:2a0524f868ac "D" (tip)
343 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob)
343 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-backup.hg (glob)
344 $ hg log --template "{phase}\n" -r 9
344 $ hg log --template "{phase}\n" -r 9
345 secret
345 secret
346 Source phase lower than destination phase: new changeset get the phase of destination:
346 Source phase lower than destination phase: new changeset get the phase of destination:
347 $ hg rebase -s8 -d9
347 $ hg rebase -s8 -d9
348 rebasing 8:6d4f22462821 "C"
348 rebasing 8:6d4f22462821 "C"
349 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-backup.hg (glob)
349 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-backup.hg (glob)
350 $ hg log --template "{phase}\n" -r 'rev(9)'
350 $ hg log --template "{phase}\n" -r 'rev(9)'
351 secret
351 secret
352
352
@@ -574,7 +574,7 b' rebase on ancestor with revset'
574 rebasing 6:3d8a618087a7 "G"
574 rebasing 6:3d8a618087a7 "G"
575 rebasing 7:72434a4e60b0 "H"
575 rebasing 7:72434a4e60b0 "H"
576 rebasing 8:479ddb54a924 "I" (tip)
576 rebasing 8:479ddb54a924 "I" (tip)
577 saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob)
577 saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-backup.hg (glob)
578 $ hg tglog
578 $ hg tglog
579 o 8: 'I'
579 o 8: 'I'
580 |
580 |
@@ -609,7 +609,7 b' We would expect heads are I, F if it was'
609 rebasing 6:3d8a618087a7 "G"
609 rebasing 6:3d8a618087a7 "G"
610 rebasing 7:72434a4e60b0 "H"
610 rebasing 7:72434a4e60b0 "H"
611 rebasing 8:479ddb54a924 "I" (tip)
611 rebasing 8:479ddb54a924 "I" (tip)
612 saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg (glob)
612 saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-backup.hg (glob)
613 $ hg tglog
613 $ hg tglog
614 o 8: 'I'
614 o 8: 'I'
615 |
615 |
@@ -678,7 +678,7 b' each root have a different common ancest'
678 $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
678 $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
679 rebasing 8:e7ec4e813ba6 "I"
679 rebasing 8:e7ec4e813ba6 "I"
680 rebasing 10:23a4ace37988 "K" (tip)
680 rebasing 10:23a4ace37988 "K" (tip)
681 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-backup.hg (glob)
681 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-backup.hg (glob)
682 $ hg log --rev 'children(desc(G))'
682 $ hg log --rev 'children(desc(G))'
683 changeset: 9:adb617877056
683 changeset: 9:adb617877056
684 parent: 6:eea13746799a
684 parent: 6:eea13746799a
@@ -742,4 +742,4 b' Test that rebase is not confused by $CWD'
742 $ hg rebase -b . -d 1 --traceback
742 $ hg rebase -b . -d 1 --traceback
743 rebasing 2:779a07b1b7a0 "first source commit"
743 rebasing 2:779a07b1b7a0 "first source commit"
744 rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip)
744 rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip)
745 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-backup.hg (glob)
745 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob)
@@ -462,7 +462,7 b' shelve should leave dirstate clean (issu'
462 $ hg rebase -d 1 --config extensions.rebase=
462 $ hg rebase -d 1 --config extensions.rebase=
463 rebasing 2:323bfa07f744 "xyz" (tip)
463 rebasing 2:323bfa07f744 "xyz" (tip)
464 merging x
464 merging x
465 saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-backup.hg (glob)
465 saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-78114325-backup.hg (glob)
466 $ hg unshelve
466 $ hg unshelve
467 unshelving change 'default'
467 unshelving change 'default'
468 rebasing shelved changes
468 rebasing shelved changes
@@ -462,7 +462,7 b' Strip adds, removes, modifies with --kee'
462 $ echo b > b
462 $ echo b > b
463 $ echo d > d
463 $ echo d > d
464 $ hg strip --keep tip
464 $ hg strip --keep tip
465 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
465 saved backup bundle to $TESTTMP/test/.hg/strip-backup/57e364c8a475-4cfed93c-backup.hg (glob)
466 $ hg status
466 $ hg status
467 M b
467 M b
468 ! bar
468 ! bar
@@ -547,3 +547,25 b' Make sure no one adds back a -b option:'
547
547
548 (use "hg strip -h" to show more help)
548 (use "hg strip -h" to show more help)
549 [255]
549 [255]
550
551 $ cd ..
552
553 Verify bundles don't get overwritten:
554
555 $ hg init doublebundle
556 $ cd doublebundle
557 $ touch a
558 $ hg commit -Aqm a
559 $ touch b
560 $ hg commit -Aqm b
561 $ hg strip -r 0
562 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
563 saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg (glob)
564 $ ls .hg/strip-backup
565 3903775176ed-e68910bd-backup.hg
566 $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg
567 $ hg strip -r 0
568 saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg (glob)
569 $ ls .hg/strip-backup
570 3903775176ed-54390173-backup.hg
571 3903775176ed-e68910bd-backup.hg
General Comments 0
You need to be logged in to leave comments. Login now