Mercurial > hg > mercurial

view mercurial-tests/testData/README @ 474:6b447cd40492 Faradi-7.1.x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TW-10076 allow to ignore commits where all files excluded by checkout rules Since 7.1 hg-plugin marks empty commits as cannot be ignored. We do that in order to show empty commits which close the branch. Since hg log doesn't contain any signs that commit closes branch, hg-plugin detects it by checking if commit has no changed files. We did that after applying checkout rules, as a result some commits with all files excluded were marked as cannot be ignored which is wrong. Now hg-plugin checks if commit is empty before applying checkout rules.
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Mon, 10 Sep 2012 20:02:07 +0400
parents 63a69ed16c88
children 2b8299ba321d
line wrap: on
line source
rep1 history:
@   10:9c6a6b4aede0 Multiline description tip
|
| o  9:9babcf2d5705 name with space branch name with space
| |
| o  8:04c3ae4c6312 file modified test_branch
| |
| o  7:376dcf05cd2a new file added in the test_branch test_branch
|/
o    6:b9deb9a1c6f4 files with spaces added
|
o    5:1d2cc6f3bc29 modified in subdir
|
o    4:b06a290a363b file modified
|
o    3:9522278aa38d file removed
|
o    2:7209b1f1d793 file4.txt added
|
o    1:1d446e82d356 new file added
|
o    0:9875b412a788 dir1 created


rep2 history:

o    21:a2672ee13212 Tag for test //add tag t1 on 43023ea3f13b
|
o    20:43023ea3f13b  Merge closed personal-branch
|\
| o  19:ca64c523f54c Close personal-branch
| |
@ |  18:df04faa7575a merge personal-branch tip
|\|
| o  17:9ec402c74298 another change to file.txt in personal-branch (personal-branch)
| |
o |  16:505c5b9d01e6 change file.txt back
| |
| o  15:96b78d73081d change file.txt in personal-branch (personal-branch)
| |
o |  14:78e67807f916 change file.txt
| |
| o  13:dec47d2d49bf create personal branch (personal-branch)
|/
o    12:1e620196c4b6 merge with test branch
|\
| o  11:48177654181c dir6 trunk
| |
o |  10:fc524efc2bc4 dir6 (test)
| |
o |  9:8c44244d6645 dir5 (test)
|/
o    8:b6e2d176fe8e merge with conflict
|\
| o  7:d6eaab231902 branch dir4
| |
o |  6:6066b677d026 file41
| |
o |  5:b4937926e2e3 dir4
|/
o    4:6eeb8974fe67 merge
|\
| o  3:2538c02bafeb dir2
| |
| o  2:db8a04d262f3 dir1
| |
o |  1:a3d15477d297 dir3
|/
o    0:e0ad3ddde5aa file.txt