view mercurial-tests/testData/README @ 1069:26edd3fdaf8a release-92234

TW-70693 (grafted from 2d8aab94494f39f647e2b56ba9f905d0f70a4f54)
author victory.bedrosova
date Thu, 18 Mar 2021 18:30:34 +0100
parents 868916a31d88
children
line wrap: on
line source
rep1 history:
o   11:e6935c9c80bf create branch and remove file.txt (test_remove)
|
o   10:9c6a6b4aede0 Multiline description
|
| 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    31:1f355761350e create branch NULL (NULL)

o    30:4780519e01aa continue default
|
| o  29:fd50e4842211 continue topic (topic)
| |
o |  28:737c6f57ef84 merge topic
|\|
| o  27:2a368008e4d9 topic2 (topic)
| |
| o  26:27184c50d7ef topic1 (topic)
| |
| o  25:4dbb87c381be start topic (topic)
| |
o |  24:528572bbf77b default3
| |
o |  23:029040d32471 default2
| |
o |  22:32f2afc19d75 default1
|/
o    21:a2672ee13212 Tag for test //add tag t1 on 43023ea3f13b
|
o    20:43023ea3f13b  Merge closed personal-branch
|\
| o  19:ca64c523f54c Close personal-branch
| |
o |  18:df04faa7575a merge personal-branch
|\|
| 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