Mercurial Mercurial > hg > stx-libview / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
.hgautomerge
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 06 Sep 2017 10:04:18 +0200
branchjv
changeset 8180 25149dfd68e0
parent 7768 662055177806
permissions -rw-r--r--
Build files: removed a bunch of make rules for long-dead unsupported systems ...in order to unify and simplify the build. If a need to support this ancient systems arose, these hacks may ni longer be needed (due to new versions of tools) or the hacks would have to be written again (better) or retrieved from SCM (worse). Time will show.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7714
dcf48ff796c8 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     1
 
[automerge]
dcf48ff796c8 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     2
 
# Automatically merge pulled changes from specified mercurial branch (if exists)
dcf48ff796c8 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     3
 
# to specified mercurial branch (if exists). The syntax is
dcf48ff796c8 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     4
 
#
dcf48ff796c8 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     5
 
# automerge = <from-branch>:<to branch>.
dcf48ff796c8 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     6
 
#
dcf48ff796c8 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     7
 
# The example below will merge changed from branch `default` to branch `jv`.
dcf48ff796c8 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     8
 
# If merge fails, issue a warning but proceed. Optional.
dcf48ff796c8 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     9
 
#
dcf48ff796c8 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    10
 
# automerge = default:jv
dcf48ff796c8 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    11
 
automerge = default:jv
7768
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    12
 
#
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    13
 
# If defined and if merge succeeds (there are no unresolved conflicts),
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    14
 
# check the merged working copy using given command. The command is executed
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    15
 
# with CWD set to repository root. `#{dir}` in the command string will be
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    16
 
# expanded to actuall repository path.
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    17
 
# Following commands are built-in:
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    18
 
#
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    19
 
# * internal:make - run `make`
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    20
 
#
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    21
 
# A command line option --check overrides this setting. See `hg-automerge --help`.
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    22
 
#
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    23
 
# checkcmd = internal:make
662055177806 Configured automerge to compile package before commiting am auto-merge
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 7714
diff changeset 
    24
 
checkcmd = internal:make
hg/stx-libview