Public bug reported:
I did a merge at the command line, manually resolved the merge and then
ran hg resolve -m.
Then when I tried to commit it from dvc, hg rejected the commit because
a list of files cannot be specified for a merge (i.e. merges don't allow
partial commits).
By the way, dvc doesn't seem to support manually resolving Mercurial
merges at all - I tried using it to do the resolve and that also failed.
** Affects: dvc
Importance: Undecided
Status: New
--
You received this bug notification because you are a member of dvc-dev,
which is subscribed to dvc.
https://bugs.launchpad.net/bugs/1234109
Title:
Commit of manually resolved Mercurial merge fails
Status in Distributed Version Control for Emacs:
New
Bug description:
I did a merge at the command line, manually resolved the merge and
then ran hg resolve -m.
Then when I tried to commit it from dvc, hg rejected the commit
because a list of files cannot be specified for a merge (i.e. merges
don't allow partial commits).
By the way, dvc doesn't seem to support manually resolving Mercurial
merges at all - I tried using it to do the resolve and that also
failed.
To manage notifications about this bug go to:
https://bugs.launchpad.net/dvc/+bug/1234109/+subscriptions
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
