Mercurial > hg > mercurial
comparison mercurial-tests/testData/README @ 588:868916a31d88
Fix incremental patch for commits with removes only
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Tue, 16 Apr 2013 16:44:54 +0400 |
parents | 2b8299ba321d |
children |
comparison
equal
deleted
inserted
replaced
587:e77ef6cd4ddb | 588:868916a31d88 |
---|---|
1 rep1 history: | 1 rep1 history: |
2 @ 10:9c6a6b4aede0 Multiline description tip | 2 o 11:e6935c9c80bf create branch and remove file.txt (test_remove) |
3 | | |
4 o 10:9c6a6b4aede0 Multiline description | |
3 | | 5 | |
4 | o 9:9babcf2d5705 name with space branch name with space | 6 | o 9:9babcf2d5705 name with space branch name with space |
5 | | | 7 | | |
6 | o 8:04c3ae4c6312 file modified test_branch | 8 | o 8:04c3ae4c6312 file modified test_branch |
7 | | | 9 | | |
22 o 0:9875b412a788 dir1 created | 24 o 0:9875b412a788 dir1 created |
23 | 25 |
24 | 26 |
25 rep2 history: | 27 rep2 history: |
26 | 28 |
27 o 31:1f355761350e create branch NULL (NULL) tip | 29 o 31:1f355761350e create branch NULL (NULL) |
28 | 30 |
29 o 30:4780519e01aa continue default tip | 31 o 30:4780519e01aa continue default |
30 | | 32 | |
31 | o 29:fd50e4842211 continue topic (topic) | 33 | o 29:fd50e4842211 continue topic (topic) |
32 | | | 34 | | |
33 o | 28:737c6f57ef84 merge topic | 35 o | 28:737c6f57ef84 merge topic |
34 |\| | 36 |\| |
48 | | 50 | |
49 o 20:43023ea3f13b Merge closed personal-branch | 51 o 20:43023ea3f13b Merge closed personal-branch |
50 |\ | 52 |\ |
51 | o 19:ca64c523f54c Close personal-branch | 53 | o 19:ca64c523f54c Close personal-branch |
52 | | | 54 | | |
53 @ | 18:df04faa7575a merge personal-branch tip | 55 o | 18:df04faa7575a merge personal-branch |
54 |\| | 56 |\| |
55 | o 17:9ec402c74298 another change to file.txt in personal-branch (personal-branch) | 57 | o 17:9ec402c74298 another change to file.txt in personal-branch (personal-branch) |
56 | | | 58 | | |
57 o | 16:505c5b9d01e6 change file.txt back | 59 o | 16:505c5b9d01e6 change file.txt back |
58 | | | 60 | | |