Mercurial > hg
view tests/test-phase-archived.t @ 45125:f55099982bc5
absorb: make it explicit if empty changeset was created
If the config rewrite.empty-successor=skip is set, a message "became empty and
was dropped" is shown if the changeset became empty. If the config
rewrite.empty-successor=keep is set, absorb may create changesets even if they
became empty. It’s probably a good idea to make that explicit. Therefore the
message is changed to be a combination of both: "became empty and became ...".
Repeating the word "became" is not very elegant. This results from the fact
that "became" was and is overloaded to indicate both the change from non-empty
to empty and the successor relation. In the combinated message, both meanings
are used in one sentence.
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Mon, 01 Jun 2020 09:55:31 +0200 |
parents | 64de5f44eec3 |
children | 0c70d888a484 |
line wrap: on
line source
========================================================= Test features and behaviors related to the archived phase ========================================================= $ cat << EOF >> $HGRCPATH > [format] > internal-phase=yes > [extensions] > strip= > [experimental] > EOF $ hg init repo $ cd repo $ echo root > a $ hg add a $ hg ci -m 'root' Test that bundle can unarchive a changeset ------------------------------------------ $ echo foo >> a $ hg st M a $ hg ci -m 'unbundletesting' $ hg log -G @ changeset: 1:883aadbbf309 | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: unbundletesting | o changeset: 0:c1863a3840c6 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: root $ hg strip --soft --rev '.' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved saved backup bundle to $TESTTMP/repo/.hg/strip-backup/883aadbbf309-efc55adc-backup.hg $ hg log -G @ changeset: 0:c1863a3840c6 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: root $ hg log -G --hidden o changeset: 1:883aadbbf309 | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: unbundletesting | @ changeset: 0:c1863a3840c6 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: root $ hg unbundle .hg/strip-backup/883aadbbf309-efc55adc-backup.hg adding changesets adding manifests adding file changes added 0 changesets with 0 changes to 1 files (run 'hg update' to get a working copy) $ hg log -G o changeset: 1:883aadbbf309 | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: unbundletesting | @ changeset: 0:c1863a3840c6 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: root Test that history rewriting command can use the archived phase when allowed to ------------------------------------------------------------------------------ $ hg up 'desc(unbundletesting)' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo bar >> a $ hg commit --amend --config experimental.cleanup-as-archived=yes $ hg log -G @ changeset: 2:d1e73e428f29 | tag: tip | parent: 0:c1863a3840c6 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: unbundletesting | o changeset: 0:c1863a3840c6 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: root $ hg log -G --hidden @ changeset: 2:d1e73e428f29 | tag: tip | parent: 0:c1863a3840c6 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: unbundletesting | | o changeset: 1:883aadbbf309 |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: unbundletesting | o changeset: 0:c1863a3840c6 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: root $ ls -1 .hg/strip-backup/ 883aadbbf309-efc55adc-amend.hg 883aadbbf309-efc55adc-backup.hg $ hg unbundle .hg/strip-backup/883aadbbf309*amend.hg adding changesets adding manifests adding file changes added 0 changesets with 0 changes to 1 files (run 'hg update' to get a working copy) $ hg log -G @ changeset: 2:d1e73e428f29 | tag: tip | parent: 0:c1863a3840c6 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: unbundletesting | | o changeset: 1:883aadbbf309 |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: unbundletesting | o changeset: 0:c1863a3840c6 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: root