Re: Updated Issue 209 - support drop/modified conflict

Stephen Leake <[email protected]>
Newsgroups gmane.comp.version-control.monotone.devel
Message-ID <[email protected]> 
I've pushed rev fc8be5f8894e0e0160f475b0cf463180649926db on
nvm.issue-209.file_attribute.

It adds a warning about lost history when a non-drop resolution to a
dropped/modified conflict is used, and requires --resolve-conflicts to
enable processing of attr mtn:resolve_conflict.

I think this represents the consensus of this discussion.

All tests are passing on Mingw.

If there are no objections, I'll merge this to main on Monday. 

-- 
-- Stephe
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.