view mercurial-tests/testData/README @ 276:8c10f5cec37d

TW-17797 Fix merge-base calculation Add MergeBaseCommand and 2 its implementations. Implementation for hg 1.7+ uses revsets to get last common ancestors. Implementation for hg <1.7 calculates merge-base manually using information about parents.
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Thu, 04 Aug 2011 12:04:38 +0400
parents 5cbb5ae712e9
children 63a69ed16c88
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:

@    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