Re: [fossil-users] why merge does not prompt for commit?

2015-08-26 Thread Stanislav Paskalev
Would you trust a merge algorithm that you software is correct post-merge ? Even if there are no merge conflicts there is no way to know whether the result is correct :) Stanislav Paskalev On Wed, Aug 26, 2015 at 9:28 AM, Luca Ferrari fluca1...@infinito.it wrote: Hi all, this could sound

Re: [fossil-users] why merge does not prompt for commit?

2015-08-26 Thread Stephan Beal
On Wed, Aug 26, 2015 at 8:28 AM, Luca Ferrari fluca1...@infinito.it wrote: Hi all, this could sound trivial, but why the merge (especially with --integrate) does not prompt immediately for a commit? What is the rationale of having merge and commit as separate actions when closing branches?

[fossil-users] why merge does not prompt for commit?

2015-08-26 Thread Luca Ferrari
Hi all, this could sound trivial, but why the merge (especially with --integrate) does not prompt immediately for a commit? What is the rationale of having merge and commit as separate actions when closing branches? The only one that comes into my mind is for aborting, is that correct? Thanks,

Re: [fossil-users] why merge does not prompt for commit?

2015-08-26 Thread David Mason
On 26 August 2015 at 04:27, Luca Ferrari fluca1...@infinito.it wrote: Correct! Shame on me. Not shame, at all! Some of the reasons for things are useful to think about, and because a popular system (e.g. GIT) does it a particular way can make us think it is the right way without thinking

Re: [fossil-users] why merge does not prompt for commit?

2015-08-26 Thread Luca Ferrari
On Wed, Aug 26, 2015 at 9:00 AM, Stephan Beal sgb...@googlemail.com wrote: Committing without first checking whether the commit was _semantically_ successful is _just plain wrong_. git does it that way, but that is a huge flaw in its thinking (IMHO). A successful merge only means that the SCM