Mercurial Mercurial > hg > stx-libcomp / 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@labware.com>
Thu, 27 Oct 2022 14:53:59 +0100
branchjv
changeset 4735 3b11fb3ede98
parent 4055 129adc2a45a5
permissions -rw-r--r--
Allow single underscore as method / block argument and temporaries This commit is a follow up for 38b221e.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4029
fdb0cc8f55b3 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     1
 
[automerge]
fdb0cc8f55b3 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)
fdb0cc8f55b3 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
fdb0cc8f55b3 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     4
 
#
fdb0cc8f55b3 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>.
fdb0cc8f55b3 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     6
 
#
fdb0cc8f55b3 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`.
fdb0cc8f55b3 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.
fdb0cc8f55b3 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     9
 
#
fdb0cc8f55b3 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    10
 
# automerge = default:jv
fdb0cc8f55b3 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    11
 
automerge = default:jv
4055
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    12
 
#
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    13
 
# If defined and if merge succeeds (there are no unresolved conflicts),
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    14
 
# check the merged working copy using given command. The command is executed
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    15
 
# with CWD set to repository root. `#{dir}` in the command string will be
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    16
 
# expanded to actuall repository path.
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    17
 
# Following commands are built-in:
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    18
 
#
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    19
 
# * internal:make - run `make`
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    20
 
#
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    21
 
# A command line option --check overrides this setting. See `hg-automerge --help`.
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    22
 
#
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    23
 
# checkcmd = internal:make
129adc2a45a5 Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 4029
diff changeset 
    24
 
checkcmd = internal:make
hg/stx-libcomp