Mercurial Mercurial > hg > stx-libbasic / 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>
Wed, 22 Mar 2023 13:57:18 +0000
branchjv
changeset 25445 1623217d2268
parent 20598 313a32c302ef
permissions -rw-r--r--
Cherry-picked OrderedCollection.st from 0b286fd51da7: * d4c86d7c0bfc: #TUNING by stefan, Stefan Vogel <sv@exept.de> * 692b6497a669: #DOCUMENTATION by stefan, Stefan Vogel <sv@exept.de> * d47bb2912953: #DOCUMENTATION by stefan, Stefan Vogel <sv@exept.de> * abb4316c6bff: #FEATURE by cg, Claus Gittinger <cg@exept.de> * 3a8fce0e8d11: #TUNING by stefan, Stefan Vogel <sv@exept.de> * 03d29bf8c5bb: #REFACTORING by stefan, Stefan Vogel <sv@exept.de> * cccc6c4abcfc: #REFACTORING by stefan, Stefan Vogel <sv@exept.de> * 35d957c7a840: #FEATURE by cg, Claus Gittinger <cg@exept.de> * 6b11890f5f2c: #OTHER by cg, Claus Gittinger <cg@exept.de> * abb6108fb06b: #FEATURE by cg, Claus Gittinger <cg@exept.de> * 2c4768bb2e89: #FEATURE by cg, Claus Gittinger <cg@exept.de> * 4029e964d0f1: #FEATURE by cg, Claus Gittinger <cg@exept.de> * ddcab3a9c2df: #OTHER by cg, Claus Gittinger <cg@exept.de> * 2213eb56e0c7: #REFACTORING by exept, Claus Gittinger <cg@exept.de> * 09ca874a6160: #REFACTORING by exept, Claus Gittinger <cg@exept.de> * 30b332af1f33: #BUGFIX by stefan, Stefan Vogel <sv@exept.de> * 779764ba117b: #REFACTORING by cg, Claus Gittinger <cg@exept.de> * b3d232a613c9: #BUGFIX by stefan, Stefan Vogel <sv@exept.de> * c417f7edaec1: #BUGFIX by stefan, Stefan Vogel <sv@exept.de> * 904b6538f379: #FEATURE by exept, Claus Gittinger <cg@exept.de> * c5887f03e01f: #REFACTORING by stefan, Stefan Vogel <sv@exept.de> * 8912d03aff48: #BUGFIX by exept, Claus Gittinger <cg@exept.de> * de5cd1dab4c3: #DOCUMENTATION by exept, Claus Gittinger <cg@exept.de> * 9bbd26603378: #OTHER by exept, Claus Gittinger <cg@exept.de> * c2c9dc110f42: #FEATURE by stefan, Stefan Vogel <sv@exept.de> * 81d123c6703d: #DOCUMENTATION by stefan, Stefan Vogel <sv@exept.de> * 8aadbb21458a: #BUGFIX by stefan, Stefan Vogel <sv@exept.de> * f210dbb8b2f6: #TUNING by stefan, Stefan Vogel <sv@exept.de> * c2c774fc53c0: #FEATURE by exept, Claus Gittinger <cg@exept.de> * b6f462670875: #DOCUMENTATION by exept, Claus Gittinger <cg@exept.de> * 27ae4021d5d6: #FEATURE by stefan, Stefan Vogel <sv@exept.de> * 10d9e9d85594: #TUNING by exept, Claus Gittinger <cg@exept.de> * 2653d855dcc7: #DOCUMENTATION by exept, Claus Gittinger <cg@exept.de> * 6ea1698a1a34: #FEATURE by stefan, Stefan Vogel <sv@exept.de> * 28762315e664: #OTHER by exept, Claus Gittinger <cg@exept.de> * 7142ea786f3e: #TUNING by stefan, Stefan Vogel <sv@exept.de> * 7875acb42b53: #BUGFIX by stefan, Stefan Vogel <sv@exept.de> * 163a0eebc97e: #BUGFIX by Maren, matilk
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
20598
313a32c302ef Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     1
 
[automerge]
313a32c302ef 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)
313a32c302ef 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
313a32c302ef Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     4
 
#
313a32c302ef 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>.
313a32c302ef Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     6
 
#
313a32c302ef 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`.
313a32c302ef 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.
313a32c302ef Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
     9
 
#
313a32c302ef Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    10
 
# automerge = default:jv
313a32c302ef Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    11
 
automerge = default:jv
313a32c302ef Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    12
 
#
313a32c302ef 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),
313a32c302ef 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
313a32c302ef 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
313a32c302ef 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.
313a32c302ef 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:
313a32c302ef Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    18
 
#
313a32c302ef Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    19
 
# * internal:make - run `make`
313a32c302ef Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    20
 
#
313a32c302ef 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`.
313a32c302ef Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    22
 
#
313a32c302ef Added .hgautomerge configuration file for `hg-automerge.rb` script.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
diff changeset 
    23
 
# checkcmd = internal:make
313a32c302ef 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-libbasic