author | Patrik Svestka <patrik.svestka@gmail.com> |
Tue, 09 Apr 2019 11:34:04 +0200 | |
branch | jv |
changeset 24093 | 0f94f6c8c9d4 |
parent 20598 | 313a32c302ef |
permissions | -rw-r--r-- |
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 |