Mercurial > hg
view tests/test-editor-filename.t @ 39224:5e52b6da9c0c
tests: demonstrate a problem with renames on the p2 side of a conversion
I think this is related to the octopus merge being sloppy, and that's having a
cascading affect on the fixup merge. If this change is made on p1 (specifically
with the 'Added parent file' commit), the failure doesn't occur.
The file modification with the rename doesn't seem to be necessary, but it's
what's happening in a production repo where I first noticed, so I left it. This
is an example of the manifest divergence I'd been seeing, which wasn't fixed by
Yuya's recent changes. This is separate from the changelog divergence I was
also seeing[1]. Probably nobody cares about bzr anymore, but this will also
affect git, since the octopus fixup code is in the hg sink.
[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2018-August/120473.html
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 20 Aug 2018 16:19:36 -0400 |
parents | 4bf1889456f3 |
children | f802a75da585 |
line wrap: on
line source
Test temp file used with an editor has the expected suffix. $ hg init Create an editor that writes its arguments to stdout and set it to $HGEDITOR. $ cat > editor.sh << EOF > echo "\$@" > exit 1 > EOF $ hg add editor.sh $ HGEDITOR="sh $TESTTMP/editor.sh" $ export HGEDITOR Verify that the path for a commit editor has the expected suffix. $ hg commit *.commit.hg.txt (glob) abort: edit failed: sh exited with status 1 [255] Verify that the path for a histedit editor has the expected suffix. $ cat >> $HGRCPATH <<EOF > [extensions] > rebase= > histedit= > EOF $ hg commit --message 'At least one commit for histedit.' $ hg histedit *.histedit.hg.txt (glob) abort: edit failed: sh exited with status 1 [255] Verify that when performing an action that has the side-effect of creating an editor for a diff, the file ends in .diff. $ echo 1 > one $ echo 2 > two $ hg add adding one adding two $ hg commit --interactive --config ui.interactive=true --config ui.interface=text << EOF > y > e > q > EOF diff --git a/one b/one new file mode 100644 examine changes to 'one'? [Ynesfdaq?] y @@ -0,0 +1,1 @@ +1 record change 1/2 to 'one'? [Ynesfdaq?] e *.diff (glob) editor exited with exit code 1 record change 1/2 to 'one'? [Ynesfdaq?] q abort: user quit [255]