Page MenuHomePhabricator

strip: during merge allow strip only when -f is used
ClosedPublic

Authored by taapas1128 on Jun 14 2019, 8:59 AM.

Details

Summary

This ensures to abort strip to hg strip when we have a merge
in progress and allow it only when a --force flag is used.

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

taapas1128 created this revision.Jun 14 2019, 8:59 AM
pulkit added a subscriber: pulkit.Jun 14 2019, 9:28 AM
pulkit added inline comments.
hgext/strip.py
54

we will need a similar dance for i18n tool detection which is done below.

also we need to add excsuffix to error message too.

tests/test-strip.t
287

this and the similar changes below should be globbed as they were before.

taapas1128 marked 2 inline comments as done.Jun 14 2019, 10:16 AM
pulkit accepted this revision.Jun 14 2019, 11:15 AM
This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.