Mercurial: comparison tests/test-strip.t

equal deleted inserted replaced

-:5feb782c7a95
+:4441705b7111
 summary:     c
 $ hg --traceback strip 4
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg (glob)
+saved backup bundle to $TESTTMP/test/.hg/strip-backup/264128213d29-0b39d6bf-backup.hg
 $ hg parents
 changeset:   1:ef3a871183d7
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     b
 multipledelete1           11:e46a4836065c
 multipledelete2           12:b4594d867745
 singlenode1               13:43227190fef8
 singlenode2               13:43227190fef8
 $ hg strip -B multipledelete1 -B multipledelete2
-saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg (glob)
+saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/e46a4836065c-89ec65c2-backup.hg
 bookmark 'multipledelete1' deleted
 bookmark 'multipledelete2' deleted
 $ hg id -ir e46a4836065c
 abort: unknown revision 'e46a4836065c'!
 [255]
 $ hg id -ir b4594d867745
 abort: unknown revision 'b4594d867745'!
 [255]
 $ hg strip -B singlenode1 -B singlenode2
-saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg (glob)
+saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/43227190fef8-8da858f2-backup.hg
 bookmark 'singlenode1' deleted
 bookmark 'singlenode2' deleted
 $ hg id -ir 43227190fef8
 abort: unknown revision '43227190fef8'!
 [255]
 $ hg commit -Aqm a
 $ touch b
 $ hg commit -Aqm b
 $ hg strip -r 0
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg (glob)
+saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-e68910bd-backup.hg
 $ ls .hg/strip-backup
 3903775176ed-e68910bd-backup.hg
 $ hg pull -q -r 3903775176ed .hg/strip-backup/3903775176ed-e68910bd-backup.hg
 $ hg strip -r 0
-saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg (glob)
+saved backup bundle to $TESTTMP/doublebundle/.hg/strip-backup/3903775176ed-54390173-backup.hg
 $ ls .hg/strip-backup
 3903775176ed-54390173-backup.hg
 3903775176ed-e68910bd-backup.hg
 $ cd ..
 6625a516847449b6f0fa3737b9ba56e9f0f3032c
 d8db9d1372214336d2b5570f20ee468d2c72fa8b
 bundle2-output-bundle: "HG20", (1 params) 2 parts total
 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
 bundle2-output-part: "phase-heads" 24 bytes payload
-saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg (glob)
+saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/6625a5168474-345bb43d-backup.hg
 updating the branch cache
 invalid branchheads cache (served): tip differs
 truncating cache/rbc-revs-v1 to 24
 $ hg log -G
 o  changeset:   2:5c51d8d6557d
 $ hg add l
 $ hg commit -m commitL
 $ hg book -r tip blah
 $ hg strip ".^" --config extensions.crash=$TESTTMP/stripstalephasecache.py
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg (glob)
+saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/8f0b4384875c-4fa10deb-backup.hg
 $ hg up -C 1
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 Error during post-close callback of the strip transaction
 (They should be gracefully handled and reported)
 >                 tr.addpostclose('crash', crash)
 >             return tr
 >     repo.__class__ = crashstriprepo
 > EOF
 $ hg strip tip --config extensions.crash=$TESTTMP/crashstrip.py
-saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg (glob)
+saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg
-strip failed, backup bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg' (glob)
+strip failed, backup bundle stored in '$TESTTMP/issue4736/.hg/strip-backup/5c51d8d6557d-70daef06-backup.hg'
 abort: boom
 [255]
 test stripping a working directory parent doesn't switch named branches
 summary:     commitA
 $ hg strip --force -r 35358f982181
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-50d992d4-backup.hg (glob)
+saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-50d992d4-backup.hg
 $ hg log -G
 @  changeset:   3:f62c6c09b707
 |  branch:      new-branch
 |  tag:         tip
 |  user:        test
 summary:     commitA
 $ hg strip -r 35358f982181
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg (glob)
+saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
 $ hg log -G
 @  changeset:   3:f62c6c09b707
 |  branch:      new-branch
 |  tag:         tip
 |  user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     commitA
 $ hg pull -u $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
-pulling from $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg (glob)
+pulling from $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 1 changes to 1 files
 new changesets 35358f982181:4cf5e92caec2
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ hg strip -k -r 35358f982181
-saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg (glob)
+saved backup bundle to $TESTTMP/issue4736/.hg/strip-backup/35358f982181-a6f020aa-backup.hg
 $ hg log -G
 @  changeset:   3:f62c6c09b707
 |  branch:      new-branch
 |  tag:         tip
 |  user:        test
 >                 repair.delayedstrip(ui, repo, getnodes('G+H+Z'), 'I')
 >                 commands.commit(ui, repo, message='J', date='0 0')
 > EOF
 $ hg testdelayedstrip --config extensions.t=$TESTTMP/delayedstrip.py
 warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22
-saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg (glob)
+saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg
 $ hg log -G -T '{rev}:{node|short} {desc}' -r 'sort(all(), topo)'
 @  6:2f2d51af6205 J
 |
 o  3:08ebfeb61bac I
 >                 scmutil.cleanupnodes(repo, mapping, 'replace')
 >                 scmutil.cleanupnodes(repo, nodes('((B::)+I+Z)-D2'), 'replace')
 > EOF
 $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
 warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60
-saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg (glob)
+saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg
 $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
 o  8:1473d4b996d1 G2 b-F@divergent3 b-G
 |
 | o  7:d11b3456a873 F2 b-F
 $ hg ci --amend -m a2
 $ hg debugobsolete
 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
 $ hg strip .
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg (glob)
+saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/489bac576828-bef27e14-backup.hg
 $ hg unbundle -q .hg/strip-backup/*
 $ hg debugobsolete
 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b 489bac576828490c0bb8d45eac9e5e172e4ec0a8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
 $ cd ..

changeset 35393	4441705b7111
parent 34961	a7e49a5b3e6f
child 35508	9b3f95d9783d