Re: [fossil-users] MERGE problem (with renames/deletes)

2015-09-25 Thread Steve Stefanovich
‎Yes, we discussed this one the list before. The fossil should at least warn about it, or more accurately raise a conflict, because that's what it really is. It's a bug. Since we've got Richard's attention to this thread, I'd point him to related bugs that were reported‎ before. Maybe these

Re: [fossil-users] MERGE problem (with renames/deletes)

2015-09-25 Thread Scott Robison
On Fri, Sep 25, 2015 at 8:32 PM, Steve Stefanovich wrote: > ‎Yes, we discussed this one the list before. The fossil should at least > warn about it, or more accurately raise a conflict, because that's what it > really is. It's a bug. > I can see a desire to raise a merge conflict,