Re: [fossil-users] Merging deleted files (Was: Merge - including files from other branches - best practice?)

2015-04-17 Thread Steve Stefanovich
I can imagine a lot of people being annoyed if auto resolution was to add a file previously deleted from a branch back to the branch. I can see that being every bit as confusing to them as it not being re-added is to you. Just as my deleted text a month ago was to me. The difference is that

Re: [fossil-users] Merging deleted files (Was: Merge - including files from other branches - best practice?)

2015-04-17 Thread Richard Hipp
On 4/16/15, Steve Stefanovich s...@stef.rs wrote: Richard, do you have a view on this? I am following this conversation closely, as well as the discussion regarding forks. But I don't have any free cycles available to work on this, or even to comment on it, at the moment. -- D. Richard Hipp

Re: [fossil-users] Merging deleted files (Was: Merge - including files from other branches - best practice?)

2015-04-16 Thread Scott Robison
On Thu, Apr 16, 2015 at 9:15 PM, Steve Stefanovich s...@stef.rs wrote: ‎I'd argue this is not intuitive, especially to a new Fossil user. Losing the file like this and not reporting at least as a warning seems like a wrong design choice, to me. I'd agree it is not intuitive, as it took some

[fossil-users] Merging deleted files (Was: Merge - including files from other branches - best practice?)

2015-04-16 Thread Steve Stefanovich
‎I'd argue this is not intuitive, especially to a new Fossil user. Losing the file like this and not reporting at least as a warning seems like a wrong design choice, to me. I actually like flagging the file as a conflict, with auto-resolution being to keep (re-add) the file. If this is tagged