Mercurial > hg
annotate tests/test-convert-cvs-detectmerge.out @ 11769:ca6cebd8734e stable
dirstate: ignore symlinks when fs cannot handle them (issue1888)
When the filesystem cannot handle the executable bit, we currently
ignore it completely when looking for modified files. Similarly, it is
impossible to set or clear the bit when the filesystem ignores it.
This patch makes Mercurial treat symbolic links the same way.
Symlinks are a little different since they manifest themselves as
small files containing a filename (the symlink target). On Windows,
these files show up as regular files, and on Linux and Mac they show
up as real symlinks.
Issue1888 presents a case where the symlink files are better ignored
from the Windows side. A Linux client creates symlinks in a working
copy which is shared over a network between Linux and Windows clients.
The Samba server is helpful and defererences the symlink when the
Windows client looks at it. This means that Mercurial on the Windows
side sees file content instead of a file name in the symlink, and
hence flags the link as modified. Ignoring the change would be much
more helpful, similarly to how Mercurial does not report any changes
when executable bits are ignored in a checkout on Windows.
An initial checkout of a symbolic link on a file system that cannot
handle symbolic links will still result in a regular file containing
the target file name as its content. Sharing such a checkout with a
Linux client will not turn the file into a symlink automatically, but
'hg revert' can fix that. After the revert, the Windows client will
see the correct file content (provided by the Samba server when it
follows the link on the Linux side) and otherwise ignore the change.
Running 'hg perfstatus' 10 times gives these results:
Before: After:
min: 0.544703 min: 0.546549
med: 0.547592 med: 0.548881
avg: 0.549146 avg: 0.548549
max: 0.564112 max: 0.551504
The median time is increased about 0.24%.
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Mon, 09 Aug 2010 15:31:56 +0200 |
parents | 56a5f80556f5 |
children |
rev | line source |
---|---|
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
1 % create cvs repository with one project |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
2 cvs -f -q -d *REPO* init |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
3 % populate cvs repository |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
4 cvs -f -Q co proj |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
5 cvs -f -Q add file1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
6 cvs -f ci -madd file1 on trunk |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
7 % create two release branches |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
8 cvs -f -q tag -b v1_0 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
9 T file1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
10 cvs -f -q tag -b v1_1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
11 T file1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
12 % modify file1 on branch v1_0 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
13 cvs -f -Q update -rv1_0 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
14 cvs -f ci -madd text |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
15 % make unrelated change on v1_1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
16 cvs -f -Q update -rv1_1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
17 cvs -f -Q add unrelated |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
18 cvs -f ci -munrelated change |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
19 % merge file1 to v1_1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
20 cvs -f -Q update -jv1_0 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
21 RCS file: *REPO*/proj/file1,v |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
22 retrieving revision 1.1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
23 retrieving revision 1.1.2.1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
24 Merging differences between 1.1 and 1.1.2.1 into file1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
25 cvs -f ci -madd text [MERGE from v1_0] |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
26 % merge change to trunk |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
27 cvs -f -Q update -A |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
28 cvs -f -Q update -jv1_1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
29 RCS file: *REPO*/proj/file1,v |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
30 retrieving revision 1.1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
31 retrieving revision 1.1.4.1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
32 Merging differences between 1.1 and 1.1.4.1 into file1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
33 cvs -f ci -madd text [MERGE from v1_1] |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
34 % non-merged change on trunk |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
35 cvs -f -Q add file2 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
36 cvs -f ci -madd file2 on trunk file2 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
37 % change on trunk to backport |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
38 cvs -f ci -madd other text file1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
39 revision 1.3 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
40 add other text |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
41 ---------------------------- |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
42 revision 1.2 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
43 add text [MERGE from v1_1] |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
44 ---------------------------- |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
45 revision 1.1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
46 branches: 1.1.2; 1.1.4; |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
47 add file1 on trunk |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
48 ---------------------------- |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
49 revision 1.1.4.1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
50 add text [MERGE from v1_0] |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
51 ---------------------------- |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
52 revision 1.1.2.1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
53 add text |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
54 ============================================================================= |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
55 % backport trunk change to v1_1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
56 cvs -f -Q update -rv1_1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
57 cvs -f -Q update -j1.2 -j1.3 file1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
58 RCS file: *REPO*/proj/file1,v |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
59 retrieving revision 1.2 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
60 retrieving revision 1.3 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
61 Merging differences between 1.2 and 1.3 into file1 |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
62 cvs -f ci -madd other text [MERGE from HEAD] file1 |
8171
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
63 % fix bug on v1_1, merge to trunk with error |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
64 cvs -f -Q update -rv1_1 |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
65 cvs -f -Q tag unmerged |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
66 cvs -f ci -mfix file1 |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
67 cvs -f -Q update -A |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
68 cvs -f -Q update -junmerged -jv1_1 |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
69 RCS file: *REPO*/proj/file1,v |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
70 retrieving revision 1.1.4.2 |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
71 retrieving revision 1.1.4.3 |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
72 Merging differences between 1.1.4.2 and 1.1.4.3 into file1 |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
73 cvs -f ci -mfix file1 [MERGE from v1-1] |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
74 % convert to hg |
8171
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
75 warning: CVS commit message references non-existent branch 'v1-1': |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
76 fix file1 [MERGE from v1-1] |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
77 initializing destination proj.hg repository |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
78 connecting to *REPO* |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
79 scanning source... |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
80 collecting CVS rlog |
8171
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
81 12 log entries |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
82 creating changesets |
8171
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
83 10 changeset entries |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
84 sorting... |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
85 converting... |
8171
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
86 9 add file1 on trunk |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
87 8 add text |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
88 7 unrelated change |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
89 6 add text [MERGE from v1_0] |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
90 5 add text [MERGE from v1_1] |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
91 4 add file2 on trunk |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
92 3 add other text |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
93 2 add other text [MERGE from HEAD] |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
94 1 fix file1 |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
95 0 fix file1 [MERGE from v1-1] |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
96 % complete log |
8171
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
97 9: '' fix file1 [MERGE from v1-1] |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
98 8: 'v1_1' fix file1 |
8170
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
99 7: 'v1_1' add other text [MERGE from HEAD] |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
100 6: '' add other text |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
101 5: '' add file2 on trunk |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
102 4: '' add text [MERGE from v1_1] |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
103 3: 'v1_1' add text [MERGE from v1_0] |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
104 2: 'v1_1' unrelated change |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
105 1: 'v1_0' add text |
6c4fdde87f90
cvsps: add test for merge detection (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
diff
changeset
|
106 0: '' add file1 on trunk |
8171
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
107 % graphical log |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
108 o 9: '' fix file1 [MERGE from v1-1] |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
109 | |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
110 | o 8: 'v1_1' fix file1 |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
111 | | |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
112 | o 7: 'v1_1' add other text [MERGE from HEAD] |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
113 |/| |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
114 o | 6: '' add other text |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
115 | | |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
116 o | 5: '' add file2 on trunk |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
117 | | |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
118 o | 4: '' add text [MERGE from v1_1] |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
119 |\| |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
120 | o 3: 'v1_1' add text [MERGE from v1_0] |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
121 | |\ |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
122 +---o 2: 'v1_1' unrelated change |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
123 | | |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
124 | o 1: 'v1_0' add text |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
125 |/ |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
126 o 0: '' add file1 on trunk |
4e5bd9b97bb3
cvsps: fix crash when log message refers to non-existent branch (issue1615).
Greg Ward <greg-hg@gerg.ca>
parents:
8170
diff
changeset
|
127 |