This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2713

tests: .hg/merge is a directory, so use `test -d`
ClosedPublic

Authored by martinvonz on Mar 7 2018, 2:07 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc164a3a282c1: tests: .hg/merge is a directory, so use `test -d`
Summary

This part of test-rebase-interrupts.t would have passed before the fix
in a580b2d65ded (rebase: make sure merge state is cleaned up for no-op
rebases (issue5494), 2017-05-18).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 7 2018, 2:07 PM
indygreg accepted this revision.Mar 8 2018, 1:26 AM
This revision is now accepted and ready to land.Mar 8 2018, 1:26 AM
Closed by commit rHGc164a3a282c1: tests: .hg/merge is a directory, so use `test -d` (authored by martinvonz). · Explain WhyMar 8 2018, 1:28 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-interruptions.t (2 lines)

Diff 6722

tests/test-rebase-interruptions.t

$ hg resolve --mark a $ hg resolve --mark a
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 1:fdaca8533b86 "b" rebasing 1:fdaca8533b86 "b"
note: rebase of 1:fdaca8533b86 created no changes to commit note: rebase of 1:fdaca8533b86 created no changes to commit
saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
$ hg resolve --list $ hg resolve --list
$ test -f .hg/merge $ test -d .hg/merge
[1] [1]