Mercurial > hg
view tests/test-phase-archived.t @ 42101:f4b1f5537d4c
overlayworkingctx: fix file/dir audit to be repo-relative
Before this patch, test-rebase-inmemory.t would stop erroring out
about the conflict if you added a "cd a" before line 252. That was
because a glob matcher (which are relative) was unintentionally
used. That happened because the matcher was given "include" patterns
(not regular patterns), and "include" patterns are always glob by
default (i.e. unless you write them including the kind prefix). IOW,
the "default='path'" argument passed to ctx.match() was ignored.
Differential Revision: https://phab.mercurial-scm.org/D6223
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 10 Apr 2019 17:31:32 -0700 |
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