|
| From: | Stephen Leake |
| Subject: | Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict |
| Date: | Thu, 21 Jun 2012 08:33:01 -0400 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/23.2 (windows-nt) |
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
| [Prev in Thread] | Current Thread | [Next in Thread] |