In the old version of this extension it was too difficult to determine how to
resume or abort the command that generated conflicts. Let's add that
information so consumers can programatically continue or abort.
Details
- Reviewers
ryanmce durham - Group Reviewers
Restricted Project - Commits
- rFBHGX44d0900950ee: conflictinfo: add more information about the conflict-causing command
Diff Detail
- Repository
- rFBHGX Facebook Mercurial Extensions
- Lint
Lint Skipped - Unit
Unit Tests Skipped
Event Timeline
tests/test-merge-conflictinfo.t | ||
---|---|---|
422 | I'll see if Aadi was relying on this. |
Accepting to unblock, but I think we need to be careful about the possibility of data loss.
hgext3rd/conflictinfo.py | ||
---|---|---|
60 | This one and updatestate's abort are a bit concerning because it can result in data loss. Is Nuclide actually running these commands for users? Or just telling users? If it's running the commands, maybe we should leave these 2 to_abort's out. Or have some flag that indicates these are not safe to run automatically. |
hgext3rd/conflictinfo.py | ||
---|---|---|
60 | It's to present buttons that let the user abort or continue after resolving conflicts, so I think in all cases there'll be data loss on abort. Not sure if update or merge is worse in that case. |
Rebased, and I made command = null if there is no conflict, just in case someone was reading it.
This one and updatestate's abort are a bit concerning because it can result in data loss. Is Nuclide actually running these commands for users? Or just telling users? If it's running the commands, maybe we should leave these 2 to_abort's out. Or have some flag that indicates these are not safe to run automatically.