Mercurial Mercurial > hg > stx-libtool / 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>
Thu, 09 Feb 2017 09:56:47 +0000
branchjv
changeset 17459 9f54cb54204c
parent 17135 81b78926f09a
permissions -rw-r--r--
Issue #120: Fixed regression with Inspector2 not showing custom presentations The cause was misuse and inconsistence between #application:, #applicationHolder:, introduced by following commit: * 9ff9bed9f98e: #OTHER by stefan This commit cleans up a lot of code, making it simpler. Also fixes the regression. https://swing.fit.cvut.cz/projects/stx-jv/ticket/120
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17135
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     1
 
[automerge]
81b78926f09a 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)
81b78926f09a 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
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     4
 
#
81b78926f09a 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>.
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     6
 
#
81b78926f09a 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`.
81b78926f09a 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.
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     9
 
#
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    10
 
# automerge = default:jv
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    11
 
automerge = default:jv
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    12
 
#
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    13
 
# If defined and if merge succeeds (there are no unresolved conflicts),
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    14
 
# check the merged working copy using given command. The command is executed
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    15
 
# with CWD set to repository root. `#{dir}` in the command string will be
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    16
 
# expanded to actuall repository path.
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    17
 
# Following commands are built-in:
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    18
 
#
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    19
 
# * internal:make - run `make`
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    20
 
#
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    21
 
# A command line option --check overrides this setting. See `hg-automerge --help`.
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    22
 
#
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    23
 
# checkcmd = internal:make
81b78926f09a Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    24
 
checkcmd = internal:make
hg/stx-libtool