Mercurial Mercurial > pub > hg > evolve / 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.
.hgignore
author Pierre-Yves David <pierre-yves.david@octobus.net>
Sun, 24 Mar 2019 21:30:12 +0530
changeset 4444 ea336a6592cc
parent 3376 aad37ffd7d58
child 5224 0a6aee4b4947
permissions -rw-r--r--
evolve: test a common case of public divergence evolve: in pubdiv, handle the case when public branch is behind the mutable In public divergence, when public branch is behind the mutable one the behaviour that this patch added is that we relocate the draft one to public side. This should be fine in most case, but might be an issue in some other (eg, when the draft side of the divergence is rebase away from ancestors it relies on.) Test written by Pierre-Yves David <pierre-yves.david@octobus.net>
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
149
03f314e32058 import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     1
 
syntax: re
03f314e32058 import some doc
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     2
 
/figures/[^/]+\.png$
242
1fc4299ca8e2 [doc] change doc generation directory
Pierre-Yves.David@ens-lyon.org
parents: 233
diff changeset 
     3
 
^html/
262
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset 
     4
 
\.pyc$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset 
     5
 
~$
391
92adb5b34a04 .hgignore: ignore vi swap files
Patrick Mezard <patrick@mezard.eu>
parents: 262
diff changeset 
     6
 
\.swp$
262
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset 
     7
 
\.orig$
4675d9c6c66b .hgignore: add .rej/.err/.orig and emacs tmp files
Patrick Mezard <patrick@mezard.eu>
parents: 242
diff changeset 
     8
 
\.rej$
3203
34d5c97a3dee hgignore: fix .err matching patterns
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2080
diff changeset 
     9
 
^tests/.*\.err$
422
cc8038e3bc23 hgignore: ignore the "common" tests/easy_run.sh file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 391
diff changeset 
    10
 
^tests/easy_run.sh$
495
53ad6062f7cc Ignore build directory
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 422
diff changeset 
    11
 
^build/
2080
b26a1f061ac8 hgignore: also ignore the 'dist' directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2020
diff changeset 
    12
 
^dist/
524
ba0a3d0f942f pkg: add proper MANIFEST.in
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 495
diff changeset 
    13
 
^MANIFEST$
526
6194f7ee85dd hgignore: ignore compiled tutorials
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 524
diff changeset 
    14
 
^docs/tutorials/.*\.rst$
557
41688ca951e7 doc: add a logo
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 526
diff changeset 
    15
 
\.ico$
1674
854421a48e0c hgignore: add an ignore rule for test timing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 557
diff changeset 
    16
 
tests/\.testtimes
3376
aad37ffd7d58 doc: import the training support
Boris Feld <boris.feld@octobus.net>
parents: 3203
diff changeset 
    17
 












aad37ffd7d58
doc: import the training support



Boris Feld <boris.feld@octobus.net>


parents: 
3203

diff
changeset




    18


^docs/training/graphs/













aad37ffd7d58
doc: import the training support



Boris Feld <boris.feld@octobus.net>


parents: 
3203

diff
changeset




    19


^docs/training/html/













aad37ffd7d58
doc: import the training support



Boris Feld <boris.feld@octobus.net>


parents: 
3203

diff
changeset




    20


^docs/training/index.html













aad37ffd7d58
doc: import the training support



Boris Feld <boris.feld@octobus.net>


parents: 
3203

diff
changeset




    21


^docs/training/graphviz-images/













aad37ffd7d58
doc: import the training support



Boris Feld <boris.feld@octobus.net>


parents: 
3203

diff
changeset




    22


^docs/training/img/













aad37ffd7d58
doc: import the training support



Boris Feld <boris.feld@octobus.net>


parents: 
3203

diff
changeset




    23


^docs/training/output/













aad37ffd7d58
doc: import the training support



Boris Feld <boris.feld@octobus.net>


parents: 
3203

diff
changeset




    24


^docs/training/pandocfilters/















evolve