Mercurial > hg
diff tests/test-convert-cvs.t @ 25571:1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
If the conversion doesn't change the hash, and the cset is public in the source,
it should be public in the destination. (This can happen if file remapping is
done that doesn't affect the initial commits.) This also propagates the secret
phase from the source, regardless of the hash, because presumably the content is
what is secret. Otherwise, the destination commit stays in the draft phase.
Maybe any draft cset with an unchanged hash should be changed to public, because
it has effectively been shared, but convert pretty strongly implies throwing
away (or at least readonly archiving) the source repo.
The change in the rollback output is because the name of the outer transaction
is now 'convert', which seems more accurate. Unfortunately, the memctx won't
indicate the hash prior to committing, so the proper phase can't be applied with
the commit.
The repo is already write locked in mercurial_sink.before().
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 14 Jun 2015 13:08:11 -0400 |
parents | 867c3649be5d |
children | c60dfcc0abf2 |
line wrap: on
line diff
--- a/tests/test-convert-cvs.t Sun Jun 14 13:04:00 2015 -0400 +++ b/tests/test-convert-cvs.t Sun Jun 14 13:08:11 2015 -0400 @@ -121,7 +121,7 @@ 1 ci0 0 import filtering out empty revision - repository tip rolled back to revision 1 (undo commit) + repository tip rolled back to revision 1 (undo convert) updating tags $ hgcat b/c c