On Fri, 13 Apr 2012, Makarius wrote:

On AFP I've also seen a machine default for "fetch" merges. This is the canonical configuration for it:

 [extensions]
 hgext.fetch =

 [defaults]
 fetch = -m "merged"

I won't argue about the exact spelling of the "merged", but it should not be the machine generated thing.

Here is another one just coming in:

changeset:   47453:598604c91036
tag:         tip
parent:      47449:5e1482296b12
parent:      47452:60da1ee5363f
user:        Andreas Lochbihler
date:        Fri Apr 13 13:30:27 2012 +0200
summary: Automated merge with ssh://macbroy25.informatik.tu-muenchen.de//home/isabelle-repository/repos/isabelle


Again, the digested content of README_REPOSITORY is important. There are deeper things in there, but at least the superficial things should be done right as a start.


        Makarius
_______________________________________________
isabelle-dev mailing list
[email protected]
https://mailmanbroy.informatik.tu-muenchen.de/mailman/listinfo/isabelle-dev

Reply via email to