Mercurial > evolve

annotate .hgignore @ 6311:466702ac6c28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: complete "//" format support in experimental.topic.linear-merge code This code is used for merging topics into bare branches (with "allow-from-bare-branch"), and it modifies branch name on a specific revision to be different from branch name on the merge destination. This allows merging the two changesets even when they belong to the same branch. Let's use formatfqbn() for consistency. The format doesn't matter much as long as the result is different from bare branch name. Topic namespace is ignored here by design, there needs to be a topic set for this linear-merge mode to work.
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 16 Sep 2022 17:00:48 +0400
parents ba316ce15040
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6115
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
1 syntax: glob
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
2 *.py[cdo]
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
3 *~
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
4 *.swp
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
5 *.orig
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
6 *.rej
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
7 *.egg-info
3376
aad37ffd7d58 doc: import the training support
Boris Feld <boris.feld@octobus.net>
parents: 3203
diff changeset
8
6115
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
9 syntax: rootglob
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
10 .idea/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
11 .mypy_cache/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
12 .pytype/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
13 .vscode/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
14 html/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
15 build/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
16 dist/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
17 MANIFEST
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
18 tests/easy_run.sh
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
19 tests/*.err
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
20 tests/.testtimes*
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
21 docs/training/graphs/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
22 docs/training/html/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
23 docs/training/index.html
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
24 docs/training/graphviz-images/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
25 docs/training/img/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
26 docs/training/output/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
27 docs/training/pandocfilters/
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
28 docs/tutorials/**.rst
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
29 docs/figures/**.png
ba316ce15040 hgignore: rewrite using globs, rootglobs
Raphaël Gomès <rgomes@octobus.net>
parents: 3376
diff changeset
30 docs/static/**.ico