Show More
| @@ -1,68 +1,68 b'' | |||||
| 1 | # filelog.py - file history class for mercurial |
|
1 | # filelog.py - file history class for mercurial | |
| 2 | # |
|
2 | # | |
| 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
| 4 | # |
|
4 | # | |
| 5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
| 6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
| 7 |
|
7 | |||
| 8 | import revlog |
|
8 | import revlog | |
| 9 |
|
9 | |||
| 10 | class filelog(revlog.revlog): |
|
10 | class filelog(revlog.revlog): | |
| 11 | def __init__(self, opener, path): |
|
11 | def __init__(self, opener, path): | |
| 12 | revlog.revlog.__init__(self, opener, |
|
12 | revlog.revlog.__init__(self, opener, | |
| 13 | "/".join(("data", path + ".i"))) |
|
13 | "/".join(("data", path + ".i"))) | |
| 14 |
|
14 | |||
| 15 | def read(self, node): |
|
15 | def read(self, node): | |
| 16 | t = self.revision(node) |
|
16 | t = self.revision(node) | |
| 17 | if not t.startswith('\1\n'): |
|
17 | if not t.startswith('\1\n'): | |
| 18 | return t |
|
18 | return t | |
| 19 | s = t.index('\1\n', 2) |
|
19 | s = t.index('\1\n', 2) | |
| 20 | return t[s + 2:] |
|
20 | return t[s + 2:] | |
| 21 |
|
21 | |||
| 22 | def _readmeta(self, node): |
|
22 | def _readmeta(self, node): | |
| 23 | t = self.revision(node) |
|
23 | t = self.revision(node) | |
| 24 | if not t.startswith('\1\n'): |
|
24 | if not t.startswith('\1\n'): | |
| 25 | return {} |
|
25 | return {} | |
| 26 | s = t.index('\1\n', 2) |
|
26 | s = t.index('\1\n', 2) | |
| 27 | mt = t[2:s] |
|
27 | mt = t[2:s] | |
| 28 | m = {} |
|
28 | m = {} | |
| 29 | for l in mt.splitlines(): |
|
29 | for l in mt.splitlines(): | |
| 30 | k, v = l.split(": ", 1) |
|
30 | k, v = l.split(": ", 1) | |
| 31 | m[k] = v |
|
31 | m[k] = v | |
| 32 | return m |
|
32 | return m | |
| 33 |
|
33 | |||
| 34 | def add(self, text, meta, transaction, link, p1=None, p2=None): |
|
34 | def add(self, text, meta, transaction, link, p1=None, p2=None): | |
| 35 | if meta or text.startswith('\1\n'): |
|
35 | if meta or text.startswith('\1\n'): | |
| 36 | mt = "" |
|
36 | mt = "" | |
| 37 | if meta: |
|
37 | if meta: | |
| 38 | mt = ["%s: %s\n" % (k, v) for k, v in meta.iteritems()] |
|
38 | mt = ["%s: %s\n" % (k, v) for k, v in sorted(meta.iteritems())] | |
| 39 | text = "\1\n%s\1\n%s" % ("".join(mt), text) |
|
39 | text = "\1\n%s\1\n%s" % ("".join(mt), text) | |
| 40 | return self.addrevision(text, transaction, link, p1, p2) |
|
40 | return self.addrevision(text, transaction, link, p1, p2) | |
| 41 |
|
41 | |||
| 42 | def renamed(self, node): |
|
42 | def renamed(self, node): | |
| 43 | if self.parents(node)[0] != revlog.nullid: |
|
43 | if self.parents(node)[0] != revlog.nullid: | |
| 44 | return False |
|
44 | return False | |
| 45 | m = self._readmeta(node) |
|
45 | m = self._readmeta(node) | |
| 46 | if m and "copy" in m: |
|
46 | if m and "copy" in m: | |
| 47 | return (m["copy"], revlog.bin(m["copyrev"])) |
|
47 | return (m["copy"], revlog.bin(m["copyrev"])) | |
| 48 | return False |
|
48 | return False | |
| 49 |
|
49 | |||
| 50 | def size(self, rev): |
|
50 | def size(self, rev): | |
| 51 | """return the size of a given revision""" |
|
51 | """return the size of a given revision""" | |
| 52 |
|
52 | |||
| 53 | # for revisions with renames, we have to go the slow way |
|
53 | # for revisions with renames, we have to go the slow way | |
| 54 | node = self.node(rev) |
|
54 | node = self.node(rev) | |
| 55 | if self.renamed(node): |
|
55 | if self.renamed(node): | |
| 56 | return len(self.read(node)) |
|
56 | return len(self.read(node)) | |
| 57 |
|
57 | |||
| 58 | return revlog.revlog.size(self, rev) |
|
58 | return revlog.revlog.size(self, rev) | |
| 59 |
|
59 | |||
| 60 | def cmp(self, node, text): |
|
60 | def cmp(self, node, text): | |
| 61 | """compare text with a given file revision""" |
|
61 | """compare text with a given file revision""" | |
| 62 |
|
62 | |||
| 63 | # for renames, we have to go the slow way |
|
63 | # for renames, we have to go the slow way | |
| 64 | if self.renamed(node): |
|
64 | if self.renamed(node): | |
| 65 | t2 = self.read(node) |
|
65 | t2 = self.read(node) | |
| 66 | return t2 != text |
|
66 | return t2 != text | |
| 67 |
|
67 | |||
| 68 | return revlog.revlog.cmp(self, node, text) |
|
68 | return revlog.revlog.cmp(self, node, text) | |
| @@ -1,249 +1,249 b'' | |||||
| 1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 2 | created new head |
|
2 | created new head | |
| 3 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 4 | rev offset length base linkrev nodeid p1 p2 |
|
4 | rev offset length base linkrev nodeid p1 p2 | |
| 5 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
|
5 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 | |
| 6 | 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 |
|
6 | 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 | |
| 7 | 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 |
|
7 | 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 | |
| 8 | 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 |
|
8 | 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 | |
| 9 | rev offset length base linkrev nodeid p1 p2 |
|
9 | rev offset length base linkrev nodeid p1 p2 | |
| 10 |
0 0 75 0 7 |
|
10 | 0 0 75 0 7 2565f3199a74 000000000000 000000000000 | |
| 11 | rev offset length base linkrev nodeid p1 p2 |
|
11 | rev offset length base linkrev nodeid p1 p2 | |
| 12 |
0 0 75 0 8 |
|
12 | 0 0 75 0 8 2565f3199a74 000000000000 000000000000 | |
| 13 | rev offset length base linkrev nodeid p1 p2 |
|
13 | rev offset length base linkrev nodeid p1 p2 | |
| 14 | 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 |
|
14 | 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 | |
| 15 | rev offset length base linkrev nodeid p1 p2 |
|
15 | rev offset length base linkrev nodeid p1 p2 | |
| 16 | 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 |
|
16 | 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 | |
| 17 | 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 |
|
17 | 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 | |
| 18 | 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 |
|
18 | 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 | |
| 19 | 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 |
|
19 | 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 | |
| 20 | 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 |
|
20 | 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 | |
| 21 |
5 250 68 3 7 |
|
21 | 5 250 68 3 7 09bb521d218d de68e904d169 000000000000 | |
| 22 |
6 318 54 6 8 |
|
22 | 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000 | |
| 23 | checking changesets |
|
23 | checking changesets | |
| 24 | checking manifests |
|
24 | checking manifests | |
| 25 | crosschecking files in changesets and manifests |
|
25 | crosschecking files in changesets and manifests | |
| 26 | checking files |
|
26 | checking files | |
| 27 | 4 files, 9 changesets, 7 total revisions |
|
27 | 4 files, 9 changesets, 7 total revisions | |
| 28 | searching for changes |
|
28 | searching for changes | |
| 29 | 1 changesets found |
|
29 | 1 changesets found | |
| 30 | adding changesets |
|
30 | adding changesets | |
| 31 | adding manifests |
|
31 | adding manifests | |
| 32 | adding file changes |
|
32 | adding file changes | |
| 33 | added 1 changesets with 1 changes to 1 files |
|
33 | added 1 changesets with 1 changes to 1 files | |
| 34 | (run 'hg update' to get a working copy) |
|
34 | (run 'hg update' to get a working copy) | |
| 35 | checking changesets |
|
35 | checking changesets | |
| 36 | checking manifests |
|
36 | checking manifests | |
| 37 | crosschecking files in changesets and manifests |
|
37 | crosschecking files in changesets and manifests | |
| 38 | checking files |
|
38 | checking files | |
| 39 | 1 files, 1 changesets, 1 total revisions |
|
39 | 1 files, 1 changesets, 1 total revisions | |
| 40 | 0:5649c9d34dd8 |
|
40 | 0:5649c9d34dd8 | |
| 41 | searching for changes |
|
41 | searching for changes | |
| 42 | 2 changesets found |
|
42 | 2 changesets found | |
| 43 | adding changesets |
|
43 | adding changesets | |
| 44 | adding manifests |
|
44 | adding manifests | |
| 45 | adding file changes |
|
45 | adding file changes | |
| 46 | added 2 changesets with 2 changes to 1 files |
|
46 | added 2 changesets with 2 changes to 1 files | |
| 47 | (run 'hg update' to get a working copy) |
|
47 | (run 'hg update' to get a working copy) | |
| 48 | checking changesets |
|
48 | checking changesets | |
| 49 | checking manifests |
|
49 | checking manifests | |
| 50 | crosschecking files in changesets and manifests |
|
50 | crosschecking files in changesets and manifests | |
| 51 | checking files |
|
51 | checking files | |
| 52 | 1 files, 2 changesets, 2 total revisions |
|
52 | 1 files, 2 changesets, 2 total revisions | |
| 53 | 1:10b2180f755b |
|
53 | 1:10b2180f755b | |
| 54 | searching for changes |
|
54 | searching for changes | |
| 55 | 3 changesets found |
|
55 | 3 changesets found | |
| 56 | adding changesets |
|
56 | adding changesets | |
| 57 | adding manifests |
|
57 | adding manifests | |
| 58 | adding file changes |
|
58 | adding file changes | |
| 59 | added 3 changesets with 3 changes to 1 files |
|
59 | added 3 changesets with 3 changes to 1 files | |
| 60 | (run 'hg update' to get a working copy) |
|
60 | (run 'hg update' to get a working copy) | |
| 61 | checking changesets |
|
61 | checking changesets | |
| 62 | checking manifests |
|
62 | checking manifests | |
| 63 | crosschecking files in changesets and manifests |
|
63 | crosschecking files in changesets and manifests | |
| 64 | checking files |
|
64 | checking files | |
| 65 | 1 files, 3 changesets, 3 total revisions |
|
65 | 1 files, 3 changesets, 3 total revisions | |
| 66 | 2:d62976ca1e50 |
|
66 | 2:d62976ca1e50 | |
| 67 | searching for changes |
|
67 | searching for changes | |
| 68 | 4 changesets found |
|
68 | 4 changesets found | |
| 69 | adding changesets |
|
69 | adding changesets | |
| 70 | adding manifests |
|
70 | adding manifests | |
| 71 | adding file changes |
|
71 | adding file changes | |
| 72 | added 4 changesets with 4 changes to 1 files |
|
72 | added 4 changesets with 4 changes to 1 files | |
| 73 | (run 'hg update' to get a working copy) |
|
73 | (run 'hg update' to get a working copy) | |
| 74 | checking changesets |
|
74 | checking changesets | |
| 75 | checking manifests |
|
75 | checking manifests | |
| 76 | crosschecking files in changesets and manifests |
|
76 | crosschecking files in changesets and manifests | |
| 77 | checking files |
|
77 | checking files | |
| 78 | 1 files, 4 changesets, 4 total revisions |
|
78 | 1 files, 4 changesets, 4 total revisions | |
| 79 | 3:ac69c658229d |
|
79 | 3:ac69c658229d | |
| 80 | searching for changes |
|
80 | searching for changes | |
| 81 | 2 changesets found |
|
81 | 2 changesets found | |
| 82 | adding changesets |
|
82 | adding changesets | |
| 83 | adding manifests |
|
83 | adding manifests | |
| 84 | adding file changes |
|
84 | adding file changes | |
| 85 | added 2 changesets with 2 changes to 1 files |
|
85 | added 2 changesets with 2 changes to 1 files | |
| 86 | (run 'hg update' to get a working copy) |
|
86 | (run 'hg update' to get a working copy) | |
| 87 | checking changesets |
|
87 | checking changesets | |
| 88 | checking manifests |
|
88 | checking manifests | |
| 89 | crosschecking files in changesets and manifests |
|
89 | crosschecking files in changesets and manifests | |
| 90 | checking files |
|
90 | checking files | |
| 91 | 1 files, 2 changesets, 2 total revisions |
|
91 | 1 files, 2 changesets, 2 total revisions | |
| 92 | 1:5f4f3ceb285e |
|
92 | 1:5f4f3ceb285e | |
| 93 | searching for changes |
|
93 | searching for changes | |
| 94 | 3 changesets found |
|
94 | 3 changesets found | |
| 95 | adding changesets |
|
95 | adding changesets | |
| 96 | adding manifests |
|
96 | adding manifests | |
| 97 | adding file changes |
|
97 | adding file changes | |
| 98 | added 3 changesets with 3 changes to 1 files |
|
98 | added 3 changesets with 3 changes to 1 files | |
| 99 | (run 'hg update' to get a working copy) |
|
99 | (run 'hg update' to get a working copy) | |
| 100 | checking changesets |
|
100 | checking changesets | |
| 101 | checking manifests |
|
101 | checking manifests | |
| 102 | crosschecking files in changesets and manifests |
|
102 | crosschecking files in changesets and manifests | |
| 103 | checking files |
|
103 | checking files | |
| 104 | 1 files, 3 changesets, 3 total revisions |
|
104 | 1 files, 3 changesets, 3 total revisions | |
| 105 | 2:024e4e7df376 |
|
105 | 2:024e4e7df376 | |
| 106 | searching for changes |
|
106 | searching for changes | |
| 107 | 4 changesets found |
|
107 | 4 changesets found | |
| 108 | adding changesets |
|
108 | adding changesets | |
| 109 | adding manifests |
|
109 | adding manifests | |
| 110 | adding file changes |
|
110 | adding file changes | |
| 111 | added 4 changesets with 5 changes to 2 files |
|
111 | added 4 changesets with 5 changes to 2 files | |
| 112 | (run 'hg update' to get a working copy) |
|
112 | (run 'hg update' to get a working copy) | |
| 113 | checking changesets |
|
113 | checking changesets | |
| 114 | checking manifests |
|
114 | checking manifests | |
| 115 | crosschecking files in changesets and manifests |
|
115 | crosschecking files in changesets and manifests | |
| 116 | checking files |
|
116 | checking files | |
| 117 | 2 files, 4 changesets, 5 total revisions |
|
117 | 2 files, 4 changesets, 5 total revisions | |
| 118 | 3:1e3f6b843bd6 |
|
118 | 3:1e3f6b843bd6 | |
| 119 | searching for changes |
|
119 | searching for changes | |
| 120 | 5 changesets found |
|
120 | 5 changesets found | |
| 121 | adding changesets |
|
121 | adding changesets | |
| 122 | adding manifests |
|
122 | adding manifests | |
| 123 | adding file changes |
|
123 | adding file changes | |
| 124 | added 5 changesets with 6 changes to 3 files |
|
124 | added 5 changesets with 6 changes to 3 files | |
| 125 | (run 'hg update' to get a working copy) |
|
125 | (run 'hg update' to get a working copy) | |
| 126 | checking changesets |
|
126 | checking changesets | |
| 127 | checking manifests |
|
127 | checking manifests | |
| 128 | crosschecking files in changesets and manifests |
|
128 | crosschecking files in changesets and manifests | |
| 129 | checking files |
|
129 | checking files | |
| 130 | 3 files, 5 changesets, 6 total revisions |
|
130 | 3 files, 5 changesets, 6 total revisions | |
| 131 | 4:80fe151401c2 |
|
131 | 4:27f57c869697 | |
| 132 | searching for changes |
|
132 | searching for changes | |
| 133 | 5 changesets found |
|
133 | 5 changesets found | |
| 134 | adding changesets |
|
134 | adding changesets | |
| 135 | adding manifests |
|
135 | adding manifests | |
| 136 | adding file changes |
|
136 | adding file changes | |
| 137 | added 5 changesets with 5 changes to 2 files |
|
137 | added 5 changesets with 5 changes to 2 files | |
| 138 | (run 'hg update' to get a working copy) |
|
138 | (run 'hg update' to get a working copy) | |
| 139 | checking changesets |
|
139 | checking changesets | |
| 140 | checking manifests |
|
140 | checking manifests | |
| 141 | crosschecking files in changesets and manifests |
|
141 | crosschecking files in changesets and manifests | |
| 142 | checking files |
|
142 | checking files | |
| 143 | 2 files, 5 changesets, 5 total revisions |
|
143 | 2 files, 5 changesets, 5 total revisions | |
| 144 | 4:836ac62537ab |
|
144 | 4:088ff9d6e1e1 | |
| 145 | pulling from ../test-7 |
|
145 | pulling from ../test-7 | |
| 146 | searching for changes |
|
146 | searching for changes | |
| 147 | adding changesets |
|
147 | adding changesets | |
| 148 | adding manifests |
|
148 | adding manifests | |
| 149 | adding file changes |
|
149 | adding file changes | |
| 150 | added 4 changesets with 2 changes to 3 files (+1 heads) |
|
150 | added 4 changesets with 2 changes to 3 files (+1 heads) | |
| 151 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
151 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 152 | checking changesets |
|
152 | checking changesets | |
| 153 | checking manifests |
|
153 | checking manifests | |
| 154 | crosschecking files in changesets and manifests |
|
154 | crosschecking files in changesets and manifests | |
| 155 | checking files |
|
155 | checking files | |
| 156 | 4 files, 9 changesets, 7 total revisions |
|
156 | 4 files, 9 changesets, 7 total revisions | |
| 157 | rolling back last transaction |
|
157 | rolling back last transaction | |
| 158 | % should fail |
|
158 | % should fail | |
| 159 | abort: --base is incompatible with specifying a destination |
|
159 | abort: --base is incompatible with specifying a destination | |
| 160 | abort: repository default-push not found! |
|
160 | abort: repository default-push not found! | |
| 161 | 2 changesets found |
|
161 | 2 changesets found | |
| 162 | 4 changesets found |
|
162 | 4 changesets found | |
| 163 | 6 changesets found |
|
163 | 6 changesets found | |
| 164 | 1 changesets found |
|
164 | 1 changesets found | |
| 165 | 1 changesets found |
|
165 | 1 changesets found | |
| 166 | 4 changesets found |
|
166 | 4 changesets found | |
| 167 | updating to branch default |
|
167 | updating to branch default | |
| 168 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
168 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 169 | % 2 |
|
169 | % 2 | |
| 170 | 2:d62976ca1e50 |
|
170 | 2:d62976ca1e50 | |
| 171 | adding changesets |
|
171 | adding changesets | |
| 172 | transaction abort! |
|
172 | transaction abort! | |
| 173 | rollback completed |
|
173 | rollback completed | |
| 174 | abort: 00changelog.i@ac69c658229d: unknown parent! |
|
174 | abort: 00changelog.i@ac69c658229d: unknown parent! | |
| 175 | % 2 |
|
175 | % 2 | |
| 176 | 2:d62976ca1e50 |
|
176 | 2:d62976ca1e50 | |
| 177 | adding changesets |
|
177 | adding changesets | |
| 178 | adding manifests |
|
178 | adding manifests | |
| 179 | adding file changes |
|
179 | adding file changes | |
| 180 | added 6 changesets with 4 changes to 4 files (+1 heads) |
|
180 | added 6 changesets with 4 changes to 4 files (+1 heads) | |
| 181 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
181 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 182 | % 8 |
|
182 | % 8 | |
| 183 | 8:836ac62537ab |
|
183 | 8:088ff9d6e1e1 | |
| 184 | checking changesets |
|
184 | checking changesets | |
| 185 | checking manifests |
|
185 | checking manifests | |
| 186 | crosschecking files in changesets and manifests |
|
186 | crosschecking files in changesets and manifests | |
| 187 | checking files |
|
187 | checking files | |
| 188 | 4 files, 9 changesets, 7 total revisions |
|
188 | 4 files, 9 changesets, 7 total revisions | |
| 189 | rolling back last transaction |
|
189 | rolling back last transaction | |
| 190 | % 2 |
|
190 | % 2 | |
| 191 | 2:d62976ca1e50 |
|
191 | 2:d62976ca1e50 | |
| 192 | adding changesets |
|
192 | adding changesets | |
| 193 | adding manifests |
|
193 | adding manifests | |
| 194 | adding file changes |
|
194 | adding file changes | |
| 195 | added 2 changesets with 2 changes to 2 files |
|
195 | added 2 changesets with 2 changes to 2 files | |
| 196 | (run 'hg update' to get a working copy) |
|
196 | (run 'hg update' to get a working copy) | |
| 197 | % 4 |
|
197 | % 4 | |
| 198 | 4:836ac62537ab |
|
198 | 4:088ff9d6e1e1 | |
| 199 | checking changesets |
|
199 | checking changesets | |
| 200 | checking manifests |
|
200 | checking manifests | |
| 201 | crosschecking files in changesets and manifests |
|
201 | crosschecking files in changesets and manifests | |
| 202 | checking files |
|
202 | checking files | |
| 203 | 2 files, 5 changesets, 5 total revisions |
|
203 | 2 files, 5 changesets, 5 total revisions | |
| 204 | rolling back last transaction |
|
204 | rolling back last transaction | |
| 205 | adding changesets |
|
205 | adding changesets | |
| 206 | adding manifests |
|
206 | adding manifests | |
| 207 | adding file changes |
|
207 | adding file changes | |
| 208 | added 4 changesets with 3 changes to 3 files (+1 heads) |
|
208 | added 4 changesets with 3 changes to 3 files (+1 heads) | |
| 209 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
209 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 210 | % 6 |
|
210 | % 6 | |
| 211 | 6:80fe151401c2 |
|
211 | 6:27f57c869697 | |
| 212 | checking changesets |
|
212 | checking changesets | |
| 213 | checking manifests |
|
213 | checking manifests | |
| 214 | crosschecking files in changesets and manifests |
|
214 | crosschecking files in changesets and manifests | |
| 215 | checking files |
|
215 | checking files | |
| 216 | 3 files, 7 changesets, 6 total revisions |
|
216 | 3 files, 7 changesets, 6 total revisions | |
| 217 | rolling back last transaction |
|
217 | rolling back last transaction | |
| 218 | adding changesets |
|
218 | adding changesets | |
| 219 | adding manifests |
|
219 | adding manifests | |
| 220 | adding file changes |
|
220 | adding file changes | |
| 221 | added 2 changesets with 2 changes to 2 files |
|
221 | added 2 changesets with 2 changes to 2 files | |
| 222 | (run 'hg update' to get a working copy) |
|
222 | (run 'hg update' to get a working copy) | |
| 223 | % 4 |
|
223 | % 4 | |
| 224 | 4:836ac62537ab |
|
224 | 4:088ff9d6e1e1 | |
| 225 | checking changesets |
|
225 | checking changesets | |
| 226 | checking manifests |
|
226 | checking manifests | |
| 227 | crosschecking files in changesets and manifests |
|
227 | crosschecking files in changesets and manifests | |
| 228 | checking files |
|
228 | checking files | |
| 229 | 2 files, 5 changesets, 5 total revisions |
|
229 | 2 files, 5 changesets, 5 total revisions | |
| 230 | warning: detected divergent renames of afile to: |
|
230 | warning: detected divergent renames of afile to: | |
| 231 | anotherfile |
|
231 | anotherfile | |
| 232 | adifferentfile |
|
232 | adifferentfile | |
| 233 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
233 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 234 | (branch merge, don't forget to commit) |
|
234 | (branch merge, don't forget to commit) | |
| 235 | 7 changesets found |
|
235 | 7 changesets found | |
| 236 | updating to branch default |
|
236 | updating to branch default | |
| 237 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
237 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 238 | adding changesets |
|
238 | adding changesets | |
| 239 | adding manifests |
|
239 | adding manifests | |
| 240 | adding file changes |
|
240 | adding file changes | |
| 241 | added 7 changesets with 4 changes to 4 files |
|
241 | added 7 changesets with 4 changes to 4 files | |
| 242 | (run 'hg update' to get a working copy) |
|
242 | (run 'hg update' to get a working copy) | |
| 243 | % 9 |
|
243 | % 9 | |
| 244 | 9:607fe5912aad |
|
244 | 9:e3061ea42e4c | |
| 245 | checking changesets |
|
245 | checking changesets | |
| 246 | checking manifests |
|
246 | checking manifests | |
| 247 | crosschecking files in changesets and manifests |
|
247 | crosschecking files in changesets and manifests | |
| 248 | checking files |
|
248 | checking files | |
| 249 | 4 files, 10 changesets, 7 total revisions |
|
249 | 4 files, 10 changesets, 7 total revisions | |
| @@ -1,365 +1,365 b'' | |||||
| 1 | ====== Setting up test |
|
1 | ====== Setting up test | |
| 2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 3 | created new head |
|
3 | created new head | |
| 4 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 5 | checking changesets |
|
5 | checking changesets | |
| 6 | checking manifests |
|
6 | checking manifests | |
| 7 | crosschecking files in changesets and manifests |
|
7 | crosschecking files in changesets and manifests | |
| 8 | checking files |
|
8 | checking files | |
| 9 | 4 files, 9 changesets, 7 total revisions |
|
9 | 4 files, 9 changesets, 7 total revisions | |
| 10 | ====== Bundle --all |
|
10 | ====== Bundle --all | |
| 11 | 9 changesets found |
|
11 | 9 changesets found | |
| 12 | ====== Bundle test to full.hg |
|
12 | ====== Bundle test to full.hg | |
| 13 | searching for changes |
|
13 | searching for changes | |
| 14 | 9 changesets found |
|
14 | 9 changesets found | |
| 15 | ====== Unbundle full.hg in test |
|
15 | ====== Unbundle full.hg in test | |
| 16 | adding changesets |
|
16 | adding changesets | |
| 17 | adding manifests |
|
17 | adding manifests | |
| 18 | adding file changes |
|
18 | adding file changes | |
| 19 | added 0 changesets with 0 changes to 4 files |
|
19 | added 0 changesets with 0 changes to 4 files | |
| 20 | (run 'hg update' to get a working copy) |
|
20 | (run 'hg update' to get a working copy) | |
| 21 | ====== Verify empty |
|
21 | ====== Verify empty | |
| 22 | checking changesets |
|
22 | checking changesets | |
| 23 | checking manifests |
|
23 | checking manifests | |
| 24 | crosschecking files in changesets and manifests |
|
24 | crosschecking files in changesets and manifests | |
| 25 | checking files |
|
25 | checking files | |
| 26 | 0 files, 0 changesets, 0 total revisions |
|
26 | 0 files, 0 changesets, 0 total revisions | |
| 27 | ====== Pull full.hg into test (using --cwd) |
|
27 | ====== Pull full.hg into test (using --cwd) | |
| 28 | pulling from ../full.hg |
|
28 | pulling from ../full.hg | |
| 29 | searching for changes |
|
29 | searching for changes | |
| 30 | no changes found |
|
30 | no changes found | |
| 31 | ====== Pull full.hg into empty (using --cwd) |
|
31 | ====== Pull full.hg into empty (using --cwd) | |
| 32 | pulling from ../full.hg |
|
32 | pulling from ../full.hg | |
| 33 | requesting all changes |
|
33 | requesting all changes | |
| 34 | adding changesets |
|
34 | adding changesets | |
| 35 | adding manifests |
|
35 | adding manifests | |
| 36 | adding file changes |
|
36 | adding file changes | |
| 37 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
37 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
| 38 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
38 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 39 | ====== Rollback empty |
|
39 | ====== Rollback empty | |
| 40 | rolling back last transaction |
|
40 | rolling back last transaction | |
| 41 | ====== Pull full.hg into empty again (using --cwd) |
|
41 | ====== Pull full.hg into empty again (using --cwd) | |
| 42 | pulling from ../full.hg |
|
42 | pulling from ../full.hg | |
| 43 | requesting all changes |
|
43 | requesting all changes | |
| 44 | adding changesets |
|
44 | adding changesets | |
| 45 | adding manifests |
|
45 | adding manifests | |
| 46 | adding file changes |
|
46 | adding file changes | |
| 47 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
47 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
| 48 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
48 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 49 | ====== Pull full.hg into test (using -R) |
|
49 | ====== Pull full.hg into test (using -R) | |
| 50 | pulling from full.hg |
|
50 | pulling from full.hg | |
| 51 | searching for changes |
|
51 | searching for changes | |
| 52 | no changes found |
|
52 | no changes found | |
| 53 | ====== Pull full.hg into empty (using -R) |
|
53 | ====== Pull full.hg into empty (using -R) | |
| 54 | pulling from full.hg |
|
54 | pulling from full.hg | |
| 55 | searching for changes |
|
55 | searching for changes | |
| 56 | no changes found |
|
56 | no changes found | |
| 57 | ====== Rollback empty |
|
57 | ====== Rollback empty | |
| 58 | rolling back last transaction |
|
58 | rolling back last transaction | |
| 59 | ====== Pull full.hg into empty again (using -R) |
|
59 | ====== Pull full.hg into empty again (using -R) | |
| 60 | pulling from full.hg |
|
60 | pulling from full.hg | |
| 61 | requesting all changes |
|
61 | requesting all changes | |
| 62 | adding changesets |
|
62 | adding changesets | |
| 63 | adding manifests |
|
63 | adding manifests | |
| 64 | adding file changes |
|
64 | adding file changes | |
| 65 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
65 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
| 66 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
66 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 67 | ====== Log -R full.hg in fresh empty |
|
67 | ====== Log -R full.hg in fresh empty | |
| 68 |
changeset: 8: |
|
68 | changeset: 8:088ff9d6e1e1 | |
| 69 | tag: tip |
|
69 | tag: tip | |
| 70 | parent: 3:ac69c658229d |
|
70 | parent: 3:ac69c658229d | |
| 71 | user: test |
|
71 | user: test | |
| 72 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
72 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 73 | summary: 0.3m |
|
73 | summary: 0.3m | |
| 74 |
|
74 | |||
| 75 | changeset: 7:80fe151401c2 |
|
75 | changeset: 7:27f57c869697 | |
| 76 | user: test |
|
76 | user: test | |
| 77 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
77 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 78 | summary: 1.3m |
|
78 | summary: 1.3m | |
| 79 |
|
79 | |||
| 80 | changeset: 6:1e3f6b843bd6 |
|
80 | changeset: 6:1e3f6b843bd6 | |
| 81 | user: test |
|
81 | user: test | |
| 82 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
82 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 83 | summary: 1.3 |
|
83 | summary: 1.3 | |
| 84 |
|
84 | |||
| 85 | changeset: 5:024e4e7df376 |
|
85 | changeset: 5:024e4e7df376 | |
| 86 | user: test |
|
86 | user: test | |
| 87 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
87 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 88 | summary: 1.2 |
|
88 | summary: 1.2 | |
| 89 |
|
89 | |||
| 90 | changeset: 4:5f4f3ceb285e |
|
90 | changeset: 4:5f4f3ceb285e | |
| 91 | parent: 0:5649c9d34dd8 |
|
91 | parent: 0:5649c9d34dd8 | |
| 92 | user: test |
|
92 | user: test | |
| 93 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
93 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 94 | summary: 1.1 |
|
94 | summary: 1.1 | |
| 95 |
|
95 | |||
| 96 | changeset: 3:ac69c658229d |
|
96 | changeset: 3:ac69c658229d | |
| 97 | user: test |
|
97 | user: test | |
| 98 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
98 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 99 | summary: 0.3 |
|
99 | summary: 0.3 | |
| 100 |
|
100 | |||
| 101 | changeset: 2:d62976ca1e50 |
|
101 | changeset: 2:d62976ca1e50 | |
| 102 | user: test |
|
102 | user: test | |
| 103 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
103 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 104 | summary: 0.2 |
|
104 | summary: 0.2 | |
| 105 |
|
105 | |||
| 106 | changeset: 1:10b2180f755b |
|
106 | changeset: 1:10b2180f755b | |
| 107 | user: test |
|
107 | user: test | |
| 108 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
108 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 109 | summary: 0.1 |
|
109 | summary: 0.1 | |
| 110 |
|
110 | |||
| 111 | changeset: 0:5649c9d34dd8 |
|
111 | changeset: 0:5649c9d34dd8 | |
| 112 | user: test |
|
112 | user: test | |
| 113 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
113 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 114 | summary: 0.0 |
|
114 | summary: 0.0 | |
| 115 |
|
115 | |||
| 116 | ====== Pull ../full.hg into empty (with hook) |
|
116 | ====== Pull ../full.hg into empty (with hook) | |
| 117 | changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:../full.hg |
|
117 | changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:../full.hg | |
| 118 | pulling from bundle://../full.hg |
|
118 | pulling from bundle://../full.hg | |
| 119 | requesting all changes |
|
119 | requesting all changes | |
| 120 | adding changesets |
|
120 | adding changesets | |
| 121 | adding manifests |
|
121 | adding manifests | |
| 122 | adding file changes |
|
122 | adding file changes | |
| 123 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
123 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
| 124 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
124 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 125 | ====== Rollback empty |
|
125 | ====== Rollback empty | |
| 126 | rolling back last transaction |
|
126 | rolling back last transaction | |
| 127 | ====== Log -R bundle:empty+full.hg |
|
127 | ====== Log -R bundle:empty+full.hg | |
| 128 | 8 7 6 5 4 3 2 1 0 |
|
128 | 8 7 6 5 4 3 2 1 0 | |
| 129 | ====== Pull full.hg into empty again (using -R; with hook) |
|
129 | ====== Pull full.hg into empty again (using -R; with hook) | |
| 130 | changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:empty+full.hg |
|
130 | changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:empty+full.hg | |
| 131 | pulling from full.hg |
|
131 | pulling from full.hg | |
| 132 | requesting all changes |
|
132 | requesting all changes | |
| 133 | adding changesets |
|
133 | adding changesets | |
| 134 | adding manifests |
|
134 | adding manifests | |
| 135 | adding file changes |
|
135 | adding file changes | |
| 136 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
136 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
| 137 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
137 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 138 | ====== Create partial clones |
|
138 | ====== Create partial clones | |
| 139 | requesting all changes |
|
139 | requesting all changes | |
| 140 | adding changesets |
|
140 | adding changesets | |
| 141 | adding manifests |
|
141 | adding manifests | |
| 142 | adding file changes |
|
142 | adding file changes | |
| 143 | added 4 changesets with 4 changes to 1 files |
|
143 | added 4 changesets with 4 changes to 1 files | |
| 144 | updating to branch default |
|
144 | updating to branch default | |
| 145 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
145 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 146 | updating to branch default |
|
146 | updating to branch default | |
| 147 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
147 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 148 | ====== Log -R full.hg in partial |
|
148 | ====== Log -R full.hg in partial | |
| 149 |
changeset: 8: |
|
149 | changeset: 8:088ff9d6e1e1 | |
| 150 | tag: tip |
|
150 | tag: tip | |
| 151 | parent: 3:ac69c658229d |
|
151 | parent: 3:ac69c658229d | |
| 152 | user: test |
|
152 | user: test | |
| 153 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
153 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 154 | summary: 0.3m |
|
154 | summary: 0.3m | |
| 155 |
|
155 | |||
| 156 | changeset: 7:80fe151401c2 |
|
156 | changeset: 7:27f57c869697 | |
| 157 | user: test |
|
157 | user: test | |
| 158 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
158 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 159 | summary: 1.3m |
|
159 | summary: 1.3m | |
| 160 |
|
160 | |||
| 161 | changeset: 6:1e3f6b843bd6 |
|
161 | changeset: 6:1e3f6b843bd6 | |
| 162 | user: test |
|
162 | user: test | |
| 163 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
163 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 164 | summary: 1.3 |
|
164 | summary: 1.3 | |
| 165 |
|
165 | |||
| 166 | changeset: 5:024e4e7df376 |
|
166 | changeset: 5:024e4e7df376 | |
| 167 | user: test |
|
167 | user: test | |
| 168 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
168 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 169 | summary: 1.2 |
|
169 | summary: 1.2 | |
| 170 |
|
170 | |||
| 171 | changeset: 4:5f4f3ceb285e |
|
171 | changeset: 4:5f4f3ceb285e | |
| 172 | parent: 0:5649c9d34dd8 |
|
172 | parent: 0:5649c9d34dd8 | |
| 173 | user: test |
|
173 | user: test | |
| 174 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
174 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 175 | summary: 1.1 |
|
175 | summary: 1.1 | |
| 176 |
|
176 | |||
| 177 | changeset: 3:ac69c658229d |
|
177 | changeset: 3:ac69c658229d | |
| 178 | user: test |
|
178 | user: test | |
| 179 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
179 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 180 | summary: 0.3 |
|
180 | summary: 0.3 | |
| 181 |
|
181 | |||
| 182 | changeset: 2:d62976ca1e50 |
|
182 | changeset: 2:d62976ca1e50 | |
| 183 | user: test |
|
183 | user: test | |
| 184 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
184 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 185 | summary: 0.2 |
|
185 | summary: 0.2 | |
| 186 |
|
186 | |||
| 187 | changeset: 1:10b2180f755b |
|
187 | changeset: 1:10b2180f755b | |
| 188 | user: test |
|
188 | user: test | |
| 189 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
189 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 190 | summary: 0.1 |
|
190 | summary: 0.1 | |
| 191 |
|
191 | |||
| 192 | changeset: 0:5649c9d34dd8 |
|
192 | changeset: 0:5649c9d34dd8 | |
| 193 | user: test |
|
193 | user: test | |
| 194 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
194 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 195 | summary: 0.0 |
|
195 | summary: 0.0 | |
| 196 |
|
196 | |||
| 197 | ====== Incoming full.hg in partial |
|
197 | ====== Incoming full.hg in partial | |
| 198 | comparing with bundle://../full.hg |
|
198 | comparing with bundle://../full.hg | |
| 199 | searching for changes |
|
199 | searching for changes | |
| 200 | changeset: 4:5f4f3ceb285e |
|
200 | changeset: 4:5f4f3ceb285e | |
| 201 | parent: 0:5649c9d34dd8 |
|
201 | parent: 0:5649c9d34dd8 | |
| 202 | user: test |
|
202 | user: test | |
| 203 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
203 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 204 | summary: 1.1 |
|
204 | summary: 1.1 | |
| 205 |
|
205 | |||
| 206 | changeset: 5:024e4e7df376 |
|
206 | changeset: 5:024e4e7df376 | |
| 207 | user: test |
|
207 | user: test | |
| 208 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
208 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 209 | summary: 1.2 |
|
209 | summary: 1.2 | |
| 210 |
|
210 | |||
| 211 | changeset: 6:1e3f6b843bd6 |
|
211 | changeset: 6:1e3f6b843bd6 | |
| 212 | user: test |
|
212 | user: test | |
| 213 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
213 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 214 | summary: 1.3 |
|
214 | summary: 1.3 | |
| 215 |
|
215 | |||
| 216 | changeset: 7:80fe151401c2 |
|
216 | changeset: 7:27f57c869697 | |
| 217 | user: test |
|
217 | user: test | |
| 218 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
218 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 219 | summary: 1.3m |
|
219 | summary: 1.3m | |
| 220 |
|
220 | |||
| 221 |
changeset: 8: |
|
221 | changeset: 8:088ff9d6e1e1 | |
| 222 | tag: tip |
|
222 | tag: tip | |
| 223 | parent: 3:ac69c658229d |
|
223 | parent: 3:ac69c658229d | |
| 224 | user: test |
|
224 | user: test | |
| 225 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
225 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 226 | summary: 0.3m |
|
226 | summary: 0.3m | |
| 227 |
|
227 | |||
| 228 | ====== Outgoing -R full.hg vs partial2 in partial |
|
228 | ====== Outgoing -R full.hg vs partial2 in partial | |
| 229 | comparing with ../partial2 |
|
229 | comparing with ../partial2 | |
| 230 | searching for changes |
|
230 | searching for changes | |
| 231 | changeset: 4:5f4f3ceb285e |
|
231 | changeset: 4:5f4f3ceb285e | |
| 232 | parent: 0:5649c9d34dd8 |
|
232 | parent: 0:5649c9d34dd8 | |
| 233 | user: test |
|
233 | user: test | |
| 234 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
234 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 235 | summary: 1.1 |
|
235 | summary: 1.1 | |
| 236 |
|
236 | |||
| 237 | changeset: 5:024e4e7df376 |
|
237 | changeset: 5:024e4e7df376 | |
| 238 | user: test |
|
238 | user: test | |
| 239 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
239 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 240 | summary: 1.2 |
|
240 | summary: 1.2 | |
| 241 |
|
241 | |||
| 242 | changeset: 6:1e3f6b843bd6 |
|
242 | changeset: 6:1e3f6b843bd6 | |
| 243 | user: test |
|
243 | user: test | |
| 244 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
244 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 245 | summary: 1.3 |
|
245 | summary: 1.3 | |
| 246 |
|
246 | |||
| 247 | changeset: 7:80fe151401c2 |
|
247 | changeset: 7:27f57c869697 | |
| 248 | user: test |
|
248 | user: test | |
| 249 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
249 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 250 | summary: 1.3m |
|
250 | summary: 1.3m | |
| 251 |
|
251 | |||
| 252 |
changeset: 8: |
|
252 | changeset: 8:088ff9d6e1e1 | |
| 253 | tag: tip |
|
253 | tag: tip | |
| 254 | parent: 3:ac69c658229d |
|
254 | parent: 3:ac69c658229d | |
| 255 | user: test |
|
255 | user: test | |
| 256 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
256 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 257 | summary: 0.3m |
|
257 | summary: 0.3m | |
| 258 |
|
258 | |||
| 259 | ====== Outgoing -R does-not-exist.hg vs partial2 in partial |
|
259 | ====== Outgoing -R does-not-exist.hg vs partial2 in partial | |
| 260 | abort: No such file or directory: ../does-not-exist.hg |
|
260 | abort: No such file or directory: ../does-not-exist.hg | |
| 261 | ====== Direct clone from bundle (all-history) |
|
261 | ====== Direct clone from bundle (all-history) | |
| 262 | requesting all changes |
|
262 | requesting all changes | |
| 263 | adding changesets |
|
263 | adding changesets | |
| 264 | adding manifests |
|
264 | adding manifests | |
| 265 | adding file changes |
|
265 | adding file changes | |
| 266 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
266 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
| 267 | updating to branch default |
|
267 | updating to branch default | |
| 268 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
268 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 269 |
changeset: 8: |
|
269 | changeset: 8:088ff9d6e1e1 | |
| 270 | tag: tip |
|
270 | tag: tip | |
| 271 | parent: 3:ac69c658229d |
|
271 | parent: 3:ac69c658229d | |
| 272 | user: test |
|
272 | user: test | |
| 273 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
273 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 274 | summary: 0.3m |
|
274 | summary: 0.3m | |
| 275 |
|
275 | |||
| 276 | changeset: 7:80fe151401c2 |
|
276 | changeset: 7:27f57c869697 | |
| 277 | user: test |
|
277 | user: test | |
| 278 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
278 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 279 | summary: 1.3m |
|
279 | summary: 1.3m | |
| 280 |
|
280 | |||
| 281 | ====== Unbundle incremental bundles into fresh empty in one go |
|
281 | ====== Unbundle incremental bundles into fresh empty in one go | |
| 282 | 1 changesets found |
|
282 | 1 changesets found | |
| 283 | 1 changesets found |
|
283 | 1 changesets found | |
| 284 | adding changesets |
|
284 | adding changesets | |
| 285 | adding manifests |
|
285 | adding manifests | |
| 286 | adding file changes |
|
286 | adding file changes | |
| 287 | added 1 changesets with 1 changes to 1 files |
|
287 | added 1 changesets with 1 changes to 1 files | |
| 288 | adding changesets |
|
288 | adding changesets | |
| 289 | adding manifests |
|
289 | adding manifests | |
| 290 | adding file changes |
|
290 | adding file changes | |
| 291 | added 1 changesets with 1 changes to 1 files |
|
291 | added 1 changesets with 1 changes to 1 files | |
| 292 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
292 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 293 | ====== test for 540d1059c802 |
|
293 | ====== test for 540d1059c802 | |
| 294 | updating to branch default |
|
294 | updating to branch default | |
| 295 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
295 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 296 | searching for changes |
|
296 | searching for changes | |
| 297 | 1 changesets found |
|
297 | 1 changesets found | |
| 298 | comparing with ../bundle.hg |
|
298 | comparing with ../bundle.hg | |
| 299 | searching for changes |
|
299 | searching for changes | |
| 300 | changeset: 2:ed1b79f46b9a |
|
300 | changeset: 2:ed1b79f46b9a | |
| 301 | tag: tip |
|
301 | tag: tip | |
| 302 | parent: 0:bbd179dfa0a7 |
|
302 | parent: 0:bbd179dfa0a7 | |
| 303 | user: test |
|
303 | user: test | |
| 304 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
304 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 305 | summary: change foo |
|
305 | summary: change foo | |
| 306 |
|
306 | |||
| 307 | ===== test that verify bundle does not traceback |
|
307 | ===== test that verify bundle does not traceback | |
| 308 | abort: 00changelog.i@bbd179dfa0a7: unknown parent! |
|
308 | abort: 00changelog.i@bbd179dfa0a7: unknown parent! | |
| 309 | abort: cannot verify bundle or remote repos |
|
309 | abort: cannot verify bundle or remote repos | |
| 310 | checking changesets |
|
310 | checking changesets | |
| 311 | checking manifests |
|
311 | checking manifests | |
| 312 | crosschecking files in changesets and manifests |
|
312 | crosschecking files in changesets and manifests | |
| 313 | checking files |
|
313 | checking files | |
| 314 | 2 files, 2 changesets, 2 total revisions |
|
314 | 2 files, 2 changesets, 2 total revisions | |
| 315 | ====== diff against bundle |
|
315 | ====== diff against bundle | |
| 316 |
diff -r |
|
316 | diff -r 088ff9d6e1e1 anotherfile | |
| 317 | --- a/anotherfile Mon Jan 12 13:46:40 1970 +0000 |
|
317 | --- a/anotherfile Mon Jan 12 13:46:40 1970 +0000 | |
| 318 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
318 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 319 | @@ -1,4 +0,0 @@ |
|
319 | @@ -1,4 +0,0 @@ | |
| 320 | -0 |
|
320 | -0 | |
| 321 | -1 |
|
321 | -1 | |
| 322 | -2 |
|
322 | -2 | |
| 323 | -3 |
|
323 | -3 | |
| 324 | ====== bundle single branch |
|
324 | ====== bundle single branch | |
| 325 | adding a |
|
325 | adding a | |
| 326 | adding b |
|
326 | adding b | |
| 327 | adding b1 |
|
327 | adding b1 | |
| 328 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
328 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 329 | adding c |
|
329 | adding c | |
| 330 | created new head |
|
330 | created new head | |
| 331 | adding c1 |
|
331 | adding c1 | |
| 332 | == bundling via incoming |
|
332 | == bundling via incoming | |
| 333 | comparing with . |
|
333 | comparing with . | |
| 334 | searching for changes |
|
334 | searching for changes | |
| 335 | d2ae7f538514cd87c17547b0de4cea71fe1af9fb |
|
335 | d2ae7f538514cd87c17547b0de4cea71fe1af9fb | |
| 336 | 5ece8e77363e2b5269e27c66828b72da29e4341a |
|
336 | 5ece8e77363e2b5269e27c66828b72da29e4341a | |
| 337 | == bundling |
|
337 | == bundling | |
| 338 | searching for changes |
|
338 | searching for changes | |
| 339 | common changesets up to c0025332f9ed |
|
339 | common changesets up to c0025332f9ed | |
| 340 | 2 changesets found |
|
340 | 2 changesets found | |
| 341 | list of changesets: |
|
341 | list of changesets: | |
| 342 | d2ae7f538514cd87c17547b0de4cea71fe1af9fb |
|
342 | d2ae7f538514cd87c17547b0de4cea71fe1af9fb | |
| 343 | 5ece8e77363e2b5269e27c66828b72da29e4341a |
|
343 | 5ece8e77363e2b5269e27c66828b72da29e4341a | |
| 344 | bundle changes: 0 chunks |
|
344 | bundle changes: 0 chunks | |
| 345 | bundle changes: 1 chunks |
|
345 | bundle changes: 1 chunks | |
| 346 | bundle changes: 2 chunks |
|
346 | bundle changes: 2 chunks | |
| 347 | bundle changes: 3 chunks |
|
347 | bundle changes: 3 chunks | |
| 348 | bundle changes: 4 chunks |
|
348 | bundle changes: 4 chunks | |
| 349 | bundle changes: 5 chunks |
|
349 | bundle changes: 5 chunks | |
| 350 | bundle changes: 6 chunks |
|
350 | bundle changes: 6 chunks | |
| 351 | bundle manifests: 0 chunks |
|
351 | bundle manifests: 0 chunks | |
| 352 | bundle manifests: 1 chunks |
|
352 | bundle manifests: 1 chunks | |
| 353 | bundle manifests: 2 chunks |
|
353 | bundle manifests: 2 chunks | |
| 354 | bundle manifests: 3 chunks |
|
354 | bundle manifests: 3 chunks | |
| 355 | bundle manifests: 4 chunks |
|
355 | bundle manifests: 4 chunks | |
| 356 | bundle manifests: 5 chunks |
|
356 | bundle manifests: 5 chunks | |
| 357 | bundle manifests: 6 chunks |
|
357 | bundle manifests: 6 chunks | |
| 358 | bundle files: b 0 chunks |
|
358 | bundle files: b 0 chunks | |
| 359 | bundle files: b 1 chunks |
|
359 | bundle files: b 1 chunks | |
| 360 | bundle files: b 2 chunks |
|
360 | bundle files: b 2 chunks | |
| 361 | bundle files: b 3 chunks |
|
361 | bundle files: b 3 chunks | |
| 362 | bundle files: b1 4 chunks |
|
362 | bundle files: b1 4 chunks | |
| 363 | bundle files: b1 5 chunks |
|
363 | bundle files: b1 5 chunks | |
| 364 | bundle files: b1 6 chunks |
|
364 | bundle files: b1 6 chunks | |
| 365 | bundle files: b1 7 chunks |
|
365 | bundle files: b1 7 chunks | |
| @@ -1,147 +1,147 b'' | |||||
| 1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 2 | created new head |
|
2 | created new head | |
| 3 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 4 | rev offset length base linkrev nodeid p1 p2 |
|
4 | rev offset length base linkrev nodeid p1 p2 | |
| 5 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
|
5 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 | |
| 6 | 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 |
|
6 | 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 | |
| 7 | 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 |
|
7 | 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 | |
| 8 | 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 |
|
8 | 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 | |
| 9 | rev offset length base linkrev nodeid p1 p2 |
|
9 | rev offset length base linkrev nodeid p1 p2 | |
| 10 |
0 0 75 0 7 |
|
10 | 0 0 75 0 7 2565f3199a74 000000000000 000000000000 | |
| 11 | rev offset length base linkrev nodeid p1 p2 |
|
11 | rev offset length base linkrev nodeid p1 p2 | |
| 12 |
0 0 75 0 8 |
|
12 | 0 0 75 0 8 2565f3199a74 000000000000 000000000000 | |
| 13 | rev offset length base linkrev nodeid p1 p2 |
|
13 | rev offset length base linkrev nodeid p1 p2 | |
| 14 | 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 |
|
14 | 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 | |
| 15 | rev offset length base linkrev nodeid p1 p2 |
|
15 | rev offset length base linkrev nodeid p1 p2 | |
| 16 | 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 |
|
16 | 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 | |
| 17 | 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 |
|
17 | 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 | |
| 18 | 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 |
|
18 | 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 | |
| 19 | 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 |
|
19 | 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 | |
| 20 | 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 |
|
20 | 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 | |
| 21 |
5 250 68 3 7 |
|
21 | 5 250 68 3 7 09bb521d218d de68e904d169 000000000000 | |
| 22 |
6 318 54 6 8 |
|
22 | 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000 | |
| 23 | checking changesets |
|
23 | checking changesets | |
| 24 | checking manifests |
|
24 | checking manifests | |
| 25 | crosschecking files in changesets and manifests |
|
25 | crosschecking files in changesets and manifests | |
| 26 | checking files |
|
26 | checking files | |
| 27 | 4 files, 9 changesets, 7 total revisions |
|
27 | 4 files, 9 changesets, 7 total revisions | |
| 28 | requesting all changes |
|
28 | requesting all changes | |
| 29 | adding changesets |
|
29 | adding changesets | |
| 30 | adding manifests |
|
30 | adding manifests | |
| 31 | adding file changes |
|
31 | adding file changes | |
| 32 | added 1 changesets with 1 changes to 1 files |
|
32 | added 1 changesets with 1 changes to 1 files | |
| 33 | updating to branch default |
|
33 | updating to branch default | |
| 34 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
34 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 35 | checking changesets |
|
35 | checking changesets | |
| 36 | checking manifests |
|
36 | checking manifests | |
| 37 | crosschecking files in changesets and manifests |
|
37 | crosschecking files in changesets and manifests | |
| 38 | checking files |
|
38 | checking files | |
| 39 | 1 files, 1 changesets, 1 total revisions |
|
39 | 1 files, 1 changesets, 1 total revisions | |
| 40 | requesting all changes |
|
40 | requesting all changes | |
| 41 | adding changesets |
|
41 | adding changesets | |
| 42 | adding manifests |
|
42 | adding manifests | |
| 43 | adding file changes |
|
43 | adding file changes | |
| 44 | added 2 changesets with 2 changes to 1 files |
|
44 | added 2 changesets with 2 changes to 1 files | |
| 45 | updating to branch default |
|
45 | updating to branch default | |
| 46 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
46 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 47 | checking changesets |
|
47 | checking changesets | |
| 48 | checking manifests |
|
48 | checking manifests | |
| 49 | crosschecking files in changesets and manifests |
|
49 | crosschecking files in changesets and manifests | |
| 50 | checking files |
|
50 | checking files | |
| 51 | 1 files, 2 changesets, 2 total revisions |
|
51 | 1 files, 2 changesets, 2 total revisions | |
| 52 | requesting all changes |
|
52 | requesting all changes | |
| 53 | adding changesets |
|
53 | adding changesets | |
| 54 | adding manifests |
|
54 | adding manifests | |
| 55 | adding file changes |
|
55 | adding file changes | |
| 56 | added 3 changesets with 3 changes to 1 files |
|
56 | added 3 changesets with 3 changes to 1 files | |
| 57 | updating to branch default |
|
57 | updating to branch default | |
| 58 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
58 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 59 | checking changesets |
|
59 | checking changesets | |
| 60 | checking manifests |
|
60 | checking manifests | |
| 61 | crosschecking files in changesets and manifests |
|
61 | crosschecking files in changesets and manifests | |
| 62 | checking files |
|
62 | checking files | |
| 63 | 1 files, 3 changesets, 3 total revisions |
|
63 | 1 files, 3 changesets, 3 total revisions | |
| 64 | requesting all changes |
|
64 | requesting all changes | |
| 65 | adding changesets |
|
65 | adding changesets | |
| 66 | adding manifests |
|
66 | adding manifests | |
| 67 | adding file changes |
|
67 | adding file changes | |
| 68 | added 4 changesets with 4 changes to 1 files |
|
68 | added 4 changesets with 4 changes to 1 files | |
| 69 | updating to branch default |
|
69 | updating to branch default | |
| 70 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
70 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 71 | checking changesets |
|
71 | checking changesets | |
| 72 | checking manifests |
|
72 | checking manifests | |
| 73 | crosschecking files in changesets and manifests |
|
73 | crosschecking files in changesets and manifests | |
| 74 | checking files |
|
74 | checking files | |
| 75 | 1 files, 4 changesets, 4 total revisions |
|
75 | 1 files, 4 changesets, 4 total revisions | |
| 76 | requesting all changes |
|
76 | requesting all changes | |
| 77 | adding changesets |
|
77 | adding changesets | |
| 78 | adding manifests |
|
78 | adding manifests | |
| 79 | adding file changes |
|
79 | adding file changes | |
| 80 | added 2 changesets with 2 changes to 1 files |
|
80 | added 2 changesets with 2 changes to 1 files | |
| 81 | updating to branch default |
|
81 | updating to branch default | |
| 82 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
82 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 83 | checking changesets |
|
83 | checking changesets | |
| 84 | checking manifests |
|
84 | checking manifests | |
| 85 | crosschecking files in changesets and manifests |
|
85 | crosschecking files in changesets and manifests | |
| 86 | checking files |
|
86 | checking files | |
| 87 | 1 files, 2 changesets, 2 total revisions |
|
87 | 1 files, 2 changesets, 2 total revisions | |
| 88 | requesting all changes |
|
88 | requesting all changes | |
| 89 | adding changesets |
|
89 | adding changesets | |
| 90 | adding manifests |
|
90 | adding manifests | |
| 91 | adding file changes |
|
91 | adding file changes | |
| 92 | added 3 changesets with 3 changes to 1 files |
|
92 | added 3 changesets with 3 changes to 1 files | |
| 93 | updating to branch default |
|
93 | updating to branch default | |
| 94 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
94 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 95 | checking changesets |
|
95 | checking changesets | |
| 96 | checking manifests |
|
96 | checking manifests | |
| 97 | crosschecking files in changesets and manifests |
|
97 | crosschecking files in changesets and manifests | |
| 98 | checking files |
|
98 | checking files | |
| 99 | 1 files, 3 changesets, 3 total revisions |
|
99 | 1 files, 3 changesets, 3 total revisions | |
| 100 | requesting all changes |
|
100 | requesting all changes | |
| 101 | adding changesets |
|
101 | adding changesets | |
| 102 | adding manifests |
|
102 | adding manifests | |
| 103 | adding file changes |
|
103 | adding file changes | |
| 104 | added 4 changesets with 5 changes to 2 files |
|
104 | added 4 changesets with 5 changes to 2 files | |
| 105 | updating to branch default |
|
105 | updating to branch default | |
| 106 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
106 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 107 | checking changesets |
|
107 | checking changesets | |
| 108 | checking manifests |
|
108 | checking manifests | |
| 109 | crosschecking files in changesets and manifests |
|
109 | crosschecking files in changesets and manifests | |
| 110 | checking files |
|
110 | checking files | |
| 111 | 2 files, 4 changesets, 5 total revisions |
|
111 | 2 files, 4 changesets, 5 total revisions | |
| 112 | requesting all changes |
|
112 | requesting all changes | |
| 113 | adding changesets |
|
113 | adding changesets | |
| 114 | adding manifests |
|
114 | adding manifests | |
| 115 | adding file changes |
|
115 | adding file changes | |
| 116 | added 5 changesets with 6 changes to 3 files |
|
116 | added 5 changesets with 6 changes to 3 files | |
| 117 | updating to branch default |
|
117 | updating to branch default | |
| 118 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
118 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 119 | checking changesets |
|
119 | checking changesets | |
| 120 | checking manifests |
|
120 | checking manifests | |
| 121 | crosschecking files in changesets and manifests |
|
121 | crosschecking files in changesets and manifests | |
| 122 | checking files |
|
122 | checking files | |
| 123 | 3 files, 5 changesets, 6 total revisions |
|
123 | 3 files, 5 changesets, 6 total revisions | |
| 124 | requesting all changes |
|
124 | requesting all changes | |
| 125 | adding changesets |
|
125 | adding changesets | |
| 126 | adding manifests |
|
126 | adding manifests | |
| 127 | adding file changes |
|
127 | adding file changes | |
| 128 | added 5 changesets with 5 changes to 2 files |
|
128 | added 5 changesets with 5 changes to 2 files | |
| 129 | updating to branch default |
|
129 | updating to branch default | |
| 130 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
130 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 131 | checking changesets |
|
131 | checking changesets | |
| 132 | checking manifests |
|
132 | checking manifests | |
| 133 | crosschecking files in changesets and manifests |
|
133 | crosschecking files in changesets and manifests | |
| 134 | checking files |
|
134 | checking files | |
| 135 | 2 files, 5 changesets, 5 total revisions |
|
135 | 2 files, 5 changesets, 5 total revisions | |
| 136 | pulling from ../test-7 |
|
136 | pulling from ../test-7 | |
| 137 | searching for changes |
|
137 | searching for changes | |
| 138 | adding changesets |
|
138 | adding changesets | |
| 139 | adding manifests |
|
139 | adding manifests | |
| 140 | adding file changes |
|
140 | adding file changes | |
| 141 | added 4 changesets with 2 changes to 3 files (+1 heads) |
|
141 | added 4 changesets with 2 changes to 3 files (+1 heads) | |
| 142 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
142 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 143 | checking changesets |
|
143 | checking changesets | |
| 144 | checking manifests |
|
144 | checking manifests | |
| 145 | crosschecking files in changesets and manifests |
|
145 | crosschecking files in changesets and manifests | |
| 146 | checking files |
|
146 | checking files | |
| 147 | 4 files, 9 changesets, 7 total revisions |
|
147 | 4 files, 9 changesets, 7 total revisions | |
| @@ -1,1073 +1,1073 b'' | |||||
| 1 | created new head |
|
1 | created new head | |
| 2 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
2 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | |
| 3 | created new head |
|
3 | created new head | |
| 4 | # default style is like normal output |
|
4 | # default style is like normal output | |
| 5 | # normal |
|
5 | # normal | |
| 6 | # verbose |
|
6 | # verbose | |
| 7 | # debug |
|
7 | # debug | |
| 8 | # revision with no copies (used to print a traceback) |
|
8 | # revision with no copies (used to print a traceback) | |
| 9 |
|
9 | |||
| 10 | # compact style works |
|
10 | # compact style works | |
| 11 |
8[tip] |
|
11 | 8[tip] 95c24699272e 2020-01-01 10:01 +0000 test | |
| 12 | third |
|
12 | third | |
| 13 |
|
13 | |||
| 14 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 user |
|
14 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 user | |
| 15 | second |
|
15 | second | |
| 16 |
|
16 | |||
| 17 | 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person |
|
17 | 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person | |
| 18 | merge |
|
18 | merge | |
| 19 |
|
19 | |||
| 20 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
20 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person | |
| 21 | new head |
|
21 | new head | |
| 22 |
|
22 | |||
| 23 | 4 32a18f097fcc 1970-01-17 04:53 +0000 person |
|
23 | 4 32a18f097fcc 1970-01-17 04:53 +0000 person | |
| 24 | new branch |
|
24 | new branch | |
| 25 |
|
25 | |||
| 26 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
26 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person | |
| 27 | no user, no domain |
|
27 | no user, no domain | |
| 28 |
|
28 | |||
| 29 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other |
|
29 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other | |
| 30 | no person |
|
30 | no person | |
| 31 |
|
31 | |||
| 32 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 other |
|
32 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 other | |
| 33 | other 1 |
|
33 | other 1 | |
| 34 |
|
34 | |||
| 35 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user |
|
35 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 user | |
| 36 | line 1 |
|
36 | line 1 | |
| 37 |
|
37 | |||
| 38 |
8[tip] |
|
38 | 8[tip] 95c24699272e 2020-01-01 10:01 +0000 test | |
| 39 | third |
|
39 | third | |
| 40 |
|
40 | |||
| 41 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
41 | 7:-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> | |
| 42 | second |
|
42 | second | |
| 43 |
|
43 | |||
| 44 | 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person |
|
44 | 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person | |
| 45 | merge |
|
45 | merge | |
| 46 |
|
46 | |||
| 47 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
47 | 5:3 13207e5a10d9 1970-01-18 08:40 +0000 person | |
| 48 | new head |
|
48 | new head | |
| 49 |
|
49 | |||
| 50 | 4 32a18f097fcc 1970-01-17 04:53 +0000 person |
|
50 | 4 32a18f097fcc 1970-01-17 04:53 +0000 person | |
| 51 | new branch |
|
51 | new branch | |
| 52 |
|
52 | |||
| 53 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
53 | 3 10e46f2dcbf4 1970-01-16 01:06 +0000 person | |
| 54 | no user, no domain |
|
54 | no user, no domain | |
| 55 |
|
55 | |||
| 56 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other@place |
|
56 | 2 97054abb4ab8 1970-01-14 21:20 +0000 other@place | |
| 57 | no person |
|
57 | no person | |
| 58 |
|
58 | |||
| 59 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> |
|
59 | 1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> | |
| 60 | other 1 |
|
60 | other 1 | |
| 61 | other 2 |
|
61 | other 2 | |
| 62 |
|
62 | |||
| 63 | other 3 |
|
63 | other 3 | |
| 64 |
|
64 | |||
| 65 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
65 | 0 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> | |
| 66 | line 1 |
|
66 | line 1 | |
| 67 | line 2 |
|
67 | line 2 | |
| 68 |
|
68 | |||
| 69 |
8[tip]:7,-1 |
|
69 | 8[tip]:7,-1 95c24699272e 2020-01-01 10:01 +0000 test | |
| 70 | third |
|
70 | third | |
| 71 |
|
71 | |||
| 72 | 7:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
72 | 7:-1,-1 29114dbae42b 1970-01-12 13:46 +0000 User Name <user@hostname> | |
| 73 | second |
|
73 | second | |
| 74 |
|
74 | |||
| 75 | 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person |
|
75 | 6:5,4 c7b487c6c50e 1970-01-18 08:40 +0000 person | |
| 76 | merge |
|
76 | merge | |
| 77 |
|
77 | |||
| 78 | 5:3,-1 13207e5a10d9 1970-01-18 08:40 +0000 person |
|
78 | 5:3,-1 13207e5a10d9 1970-01-18 08:40 +0000 person | |
| 79 | new head |
|
79 | new head | |
| 80 |
|
80 | |||
| 81 | 4:3,-1 32a18f097fcc 1970-01-17 04:53 +0000 person |
|
81 | 4:3,-1 32a18f097fcc 1970-01-17 04:53 +0000 person | |
| 82 | new branch |
|
82 | new branch | |
| 83 |
|
83 | |||
| 84 | 3:2,-1 10e46f2dcbf4 1970-01-16 01:06 +0000 person |
|
84 | 3:2,-1 10e46f2dcbf4 1970-01-16 01:06 +0000 person | |
| 85 | no user, no domain |
|
85 | no user, no domain | |
| 86 |
|
86 | |||
| 87 | 2:1,-1 97054abb4ab8 1970-01-14 21:20 +0000 other@place |
|
87 | 2:1,-1 97054abb4ab8 1970-01-14 21:20 +0000 other@place | |
| 88 | no person |
|
88 | no person | |
| 89 |
|
89 | |||
| 90 | 1:0,-1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> |
|
90 | 1:0,-1 b608e9d1a3f0 1970-01-13 17:33 +0000 A. N. Other <other@place> | |
| 91 | other 1 |
|
91 | other 1 | |
| 92 | other 2 |
|
92 | other 2 | |
| 93 |
|
93 | |||
| 94 | other 3 |
|
94 | other 3 | |
| 95 |
|
95 | |||
| 96 | 0:-1,-1 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> |
|
96 | 0:-1,-1 1e4e1b8f71e0 1970-01-12 13:46 +0000 User Name <user@hostname> | |
| 97 | line 1 |
|
97 | line 1 | |
| 98 | line 2 |
|
98 | line 2 | |
| 99 |
|
99 | |||
| 100 | # xml style works (--style xml) |
|
100 | # xml style works (--style xml) | |
| 101 | <?xml version="1.0"?> |
|
101 | <?xml version="1.0"?> | |
| 102 | <log> |
|
102 | <log> | |
| 103 | <logentry revision="8" node="3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57"> |
|
103 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> | |
| 104 | <tag>tip</tag> |
|
104 | <tag>tip</tag> | |
| 105 | <author email="test">test</author> |
|
105 | <author email="test">test</author> | |
| 106 | <date>2020-01-01T10:01:00+00:00</date> |
|
106 | <date>2020-01-01T10:01:00+00:00</date> | |
| 107 | <msg xml:space="preserve">third</msg> |
|
107 | <msg xml:space="preserve">third</msg> | |
| 108 | </logentry> |
|
108 | </logentry> | |
| 109 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> |
|
109 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> | |
| 110 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
110 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
| 111 | <author email="user@hostname">User Name</author> |
|
111 | <author email="user@hostname">User Name</author> | |
| 112 | <date>1970-01-12T13:46:40+00:00</date> |
|
112 | <date>1970-01-12T13:46:40+00:00</date> | |
| 113 | <msg xml:space="preserve">second</msg> |
|
113 | <msg xml:space="preserve">second</msg> | |
| 114 | </logentry> |
|
114 | </logentry> | |
| 115 | <logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f"> |
|
115 | <logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f"> | |
| 116 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> |
|
116 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> | |
| 117 | <parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" /> |
|
117 | <parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" /> | |
| 118 | <author email="person">person</author> |
|
118 | <author email="person">person</author> | |
| 119 | <date>1970-01-18T08:40:01+00:00</date> |
|
119 | <date>1970-01-18T08:40:01+00:00</date> | |
| 120 | <msg xml:space="preserve">merge</msg> |
|
120 | <msg xml:space="preserve">merge</msg> | |
| 121 | </logentry> |
|
121 | </logentry> | |
| 122 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> |
|
122 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> | |
| 123 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
123 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> | |
| 124 | <author email="person">person</author> |
|
124 | <author email="person">person</author> | |
| 125 | <date>1970-01-18T08:40:00+00:00</date> |
|
125 | <date>1970-01-18T08:40:00+00:00</date> | |
| 126 | <msg xml:space="preserve">new head</msg> |
|
126 | <msg xml:space="preserve">new head</msg> | |
| 127 | </logentry> |
|
127 | </logentry> | |
| 128 | <logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4"> |
|
128 | <logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4"> | |
| 129 | <branch>foo</branch> |
|
129 | <branch>foo</branch> | |
| 130 | <author email="person">person</author> |
|
130 | <author email="person">person</author> | |
| 131 | <date>1970-01-17T04:53:20+00:00</date> |
|
131 | <date>1970-01-17T04:53:20+00:00</date> | |
| 132 | <msg xml:space="preserve">new branch</msg> |
|
132 | <msg xml:space="preserve">new branch</msg> | |
| 133 | </logentry> |
|
133 | </logentry> | |
| 134 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> |
|
134 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> | |
| 135 | <author email="person">person</author> |
|
135 | <author email="person">person</author> | |
| 136 | <date>1970-01-16T01:06:40+00:00</date> |
|
136 | <date>1970-01-16T01:06:40+00:00</date> | |
| 137 | <msg xml:space="preserve">no user, no domain</msg> |
|
137 | <msg xml:space="preserve">no user, no domain</msg> | |
| 138 | </logentry> |
|
138 | </logentry> | |
| 139 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> |
|
139 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> | |
| 140 | <author email="other@place">other</author> |
|
140 | <author email="other@place">other</author> | |
| 141 | <date>1970-01-14T21:20:00+00:00</date> |
|
141 | <date>1970-01-14T21:20:00+00:00</date> | |
| 142 | <msg xml:space="preserve">no person</msg> |
|
142 | <msg xml:space="preserve">no person</msg> | |
| 143 | </logentry> |
|
143 | </logentry> | |
| 144 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> |
|
144 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> | |
| 145 | <author email="other@place">A. N. Other</author> |
|
145 | <author email="other@place">A. N. Other</author> | |
| 146 | <date>1970-01-13T17:33:20+00:00</date> |
|
146 | <date>1970-01-13T17:33:20+00:00</date> | |
| 147 | <msg xml:space="preserve">other 1 |
|
147 | <msg xml:space="preserve">other 1 | |
| 148 | other 2 |
|
148 | other 2 | |
| 149 |
|
149 | |||
| 150 | other 3</msg> |
|
150 | other 3</msg> | |
| 151 | </logentry> |
|
151 | </logentry> | |
| 152 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> |
|
152 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> | |
| 153 | <author email="user@hostname">User Name</author> |
|
153 | <author email="user@hostname">User Name</author> | |
| 154 | <date>1970-01-12T13:46:40+00:00</date> |
|
154 | <date>1970-01-12T13:46:40+00:00</date> | |
| 155 | <msg xml:space="preserve">line 1 |
|
155 | <msg xml:space="preserve">line 1 | |
| 156 | line 2</msg> |
|
156 | line 2</msg> | |
| 157 | </logentry> |
|
157 | </logentry> | |
| 158 | </log> |
|
158 | </log> | |
| 159 | # xml style works (-v --style xml) |
|
159 | # xml style works (-v --style xml) | |
| 160 | <?xml version="1.0"?> |
|
160 | <?xml version="1.0"?> | |
| 161 | <log> |
|
161 | <log> | |
| 162 | <logentry revision="8" node="3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57"> |
|
162 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> | |
| 163 | <tag>tip</tag> |
|
163 | <tag>tip</tag> | |
| 164 | <author email="test">test</author> |
|
164 | <author email="test">test</author> | |
| 165 | <date>2020-01-01T10:01:00+00:00</date> |
|
165 | <date>2020-01-01T10:01:00+00:00</date> | |
| 166 | <msg xml:space="preserve">third</msg> |
|
166 | <msg xml:space="preserve">third</msg> | |
| 167 | <paths> |
|
167 | <paths> | |
| 168 | <path action="A">fourth</path> |
|
168 | <path action="A">fourth</path> | |
| 169 | <path action="A">third</path> |
|
169 | <path action="A">third</path> | |
| 170 | <path action="R">second</path> |
|
170 | <path action="R">second</path> | |
| 171 | </paths> |
|
171 | </paths> | |
| 172 | <copies> |
|
172 | <copies> | |
| 173 | <copy source="second">fourth</copy> |
|
173 | <copy source="second">fourth</copy> | |
| 174 | </copies> |
|
174 | </copies> | |
| 175 | </logentry> |
|
175 | </logentry> | |
| 176 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> |
|
176 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> | |
| 177 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
177 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
| 178 | <author email="user@hostname">User Name</author> |
|
178 | <author email="user@hostname">User Name</author> | |
| 179 | <date>1970-01-12T13:46:40+00:00</date> |
|
179 | <date>1970-01-12T13:46:40+00:00</date> | |
| 180 | <msg xml:space="preserve">second</msg> |
|
180 | <msg xml:space="preserve">second</msg> | |
| 181 | <paths> |
|
181 | <paths> | |
| 182 | <path action="A">second</path> |
|
182 | <path action="A">second</path> | |
| 183 | </paths> |
|
183 | </paths> | |
| 184 | </logentry> |
|
184 | </logentry> | |
| 185 | <logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f"> |
|
185 | <logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f"> | |
| 186 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> |
|
186 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> | |
| 187 | <parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" /> |
|
187 | <parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" /> | |
| 188 | <author email="person">person</author> |
|
188 | <author email="person">person</author> | |
| 189 | <date>1970-01-18T08:40:01+00:00</date> |
|
189 | <date>1970-01-18T08:40:01+00:00</date> | |
| 190 | <msg xml:space="preserve">merge</msg> |
|
190 | <msg xml:space="preserve">merge</msg> | |
| 191 | <paths> |
|
191 | <paths> | |
| 192 | </paths> |
|
192 | </paths> | |
| 193 | </logentry> |
|
193 | </logentry> | |
| 194 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> |
|
194 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> | |
| 195 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
195 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> | |
| 196 | <author email="person">person</author> |
|
196 | <author email="person">person</author> | |
| 197 | <date>1970-01-18T08:40:00+00:00</date> |
|
197 | <date>1970-01-18T08:40:00+00:00</date> | |
| 198 | <msg xml:space="preserve">new head</msg> |
|
198 | <msg xml:space="preserve">new head</msg> | |
| 199 | <paths> |
|
199 | <paths> | |
| 200 | <path action="A">d</path> |
|
200 | <path action="A">d</path> | |
| 201 | </paths> |
|
201 | </paths> | |
| 202 | </logentry> |
|
202 | </logentry> | |
| 203 | <logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4"> |
|
203 | <logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4"> | |
| 204 | <branch>foo</branch> |
|
204 | <branch>foo</branch> | |
| 205 | <author email="person">person</author> |
|
205 | <author email="person">person</author> | |
| 206 | <date>1970-01-17T04:53:20+00:00</date> |
|
206 | <date>1970-01-17T04:53:20+00:00</date> | |
| 207 | <msg xml:space="preserve">new branch</msg> |
|
207 | <msg xml:space="preserve">new branch</msg> | |
| 208 | <paths> |
|
208 | <paths> | |
| 209 | </paths> |
|
209 | </paths> | |
| 210 | </logentry> |
|
210 | </logentry> | |
| 211 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> |
|
211 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> | |
| 212 | <author email="person">person</author> |
|
212 | <author email="person">person</author> | |
| 213 | <date>1970-01-16T01:06:40+00:00</date> |
|
213 | <date>1970-01-16T01:06:40+00:00</date> | |
| 214 | <msg xml:space="preserve">no user, no domain</msg> |
|
214 | <msg xml:space="preserve">no user, no domain</msg> | |
| 215 | <paths> |
|
215 | <paths> | |
| 216 | <path action="M">c</path> |
|
216 | <path action="M">c</path> | |
| 217 | </paths> |
|
217 | </paths> | |
| 218 | </logentry> |
|
218 | </logentry> | |
| 219 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> |
|
219 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> | |
| 220 | <author email="other@place">other</author> |
|
220 | <author email="other@place">other</author> | |
| 221 | <date>1970-01-14T21:20:00+00:00</date> |
|
221 | <date>1970-01-14T21:20:00+00:00</date> | |
| 222 | <msg xml:space="preserve">no person</msg> |
|
222 | <msg xml:space="preserve">no person</msg> | |
| 223 | <paths> |
|
223 | <paths> | |
| 224 | <path action="A">c</path> |
|
224 | <path action="A">c</path> | |
| 225 | </paths> |
|
225 | </paths> | |
| 226 | </logentry> |
|
226 | </logentry> | |
| 227 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> |
|
227 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> | |
| 228 | <author email="other@place">A. N. Other</author> |
|
228 | <author email="other@place">A. N. Other</author> | |
| 229 | <date>1970-01-13T17:33:20+00:00</date> |
|
229 | <date>1970-01-13T17:33:20+00:00</date> | |
| 230 | <msg xml:space="preserve">other 1 |
|
230 | <msg xml:space="preserve">other 1 | |
| 231 | other 2 |
|
231 | other 2 | |
| 232 |
|
232 | |||
| 233 | other 3</msg> |
|
233 | other 3</msg> | |
| 234 | <paths> |
|
234 | <paths> | |
| 235 | <path action="A">b</path> |
|
235 | <path action="A">b</path> | |
| 236 | </paths> |
|
236 | </paths> | |
| 237 | </logentry> |
|
237 | </logentry> | |
| 238 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> |
|
238 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> | |
| 239 | <author email="user@hostname">User Name</author> |
|
239 | <author email="user@hostname">User Name</author> | |
| 240 | <date>1970-01-12T13:46:40+00:00</date> |
|
240 | <date>1970-01-12T13:46:40+00:00</date> | |
| 241 | <msg xml:space="preserve">line 1 |
|
241 | <msg xml:space="preserve">line 1 | |
| 242 | line 2</msg> |
|
242 | line 2</msg> | |
| 243 | <paths> |
|
243 | <paths> | |
| 244 | <path action="A">a</path> |
|
244 | <path action="A">a</path> | |
| 245 | </paths> |
|
245 | </paths> | |
| 246 | </logentry> |
|
246 | </logentry> | |
| 247 | </log> |
|
247 | </log> | |
| 248 | # xml style works (--debug --style xml) |
|
248 | # xml style works (--debug --style xml) | |
| 249 | <?xml version="1.0"?> |
|
249 | <?xml version="1.0"?> | |
| 250 | <log> |
|
250 | <log> | |
| 251 | <logentry revision="8" node="3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57"> |
|
251 | <logentry revision="8" node="95c24699272ef57d062b8bccc32c878bf841784a"> | |
| 252 | <tag>tip</tag> |
|
252 | <tag>tip</tag> | |
| 253 | <parent revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453" /> |
|
253 | <parent revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453" /> | |
| 254 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
254 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
| 255 | <author email="test">test</author> |
|
255 | <author email="test">test</author> | |
| 256 | <date>2020-01-01T10:01:00+00:00</date> |
|
256 | <date>2020-01-01T10:01:00+00:00</date> | |
| 257 | <msg xml:space="preserve">third</msg> |
|
257 | <msg xml:space="preserve">third</msg> | |
| 258 | <paths> |
|
258 | <paths> | |
| 259 | <path action="A">fourth</path> |
|
259 | <path action="A">fourth</path> | |
| 260 | <path action="A">third</path> |
|
260 | <path action="A">third</path> | |
| 261 | <path action="R">second</path> |
|
261 | <path action="R">second</path> | |
| 262 | </paths> |
|
262 | </paths> | |
| 263 | <copies> |
|
263 | <copies> | |
| 264 | <copy source="second">fourth</copy> |
|
264 | <copy source="second">fourth</copy> | |
| 265 | </copies> |
|
265 | </copies> | |
| 266 | <extra key="branch">default</extra> |
|
266 | <extra key="branch">default</extra> | |
| 267 | </logentry> |
|
267 | </logentry> | |
| 268 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> |
|
268 | <logentry revision="7" node="29114dbae42b9f078cf2714dbe3a86bba8ec7453"> | |
| 269 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
269 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
| 270 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
270 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
| 271 | <author email="user@hostname">User Name</author> |
|
271 | <author email="user@hostname">User Name</author> | |
| 272 | <date>1970-01-12T13:46:40+00:00</date> |
|
272 | <date>1970-01-12T13:46:40+00:00</date> | |
| 273 | <msg xml:space="preserve">second</msg> |
|
273 | <msg xml:space="preserve">second</msg> | |
| 274 | <paths> |
|
274 | <paths> | |
| 275 | <path action="A">second</path> |
|
275 | <path action="A">second</path> | |
| 276 | </paths> |
|
276 | </paths> | |
| 277 | <extra key="branch">default</extra> |
|
277 | <extra key="branch">default</extra> | |
| 278 | </logentry> |
|
278 | </logentry> | |
| 279 | <logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f"> |
|
279 | <logentry revision="6" node="c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f"> | |
| 280 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> |
|
280 | <parent revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f" /> | |
| 281 | <parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" /> |
|
281 | <parent revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4" /> | |
| 282 | <author email="person">person</author> |
|
282 | <author email="person">person</author> | |
| 283 | <date>1970-01-18T08:40:01+00:00</date> |
|
283 | <date>1970-01-18T08:40:01+00:00</date> | |
| 284 | <msg xml:space="preserve">merge</msg> |
|
284 | <msg xml:space="preserve">merge</msg> | |
| 285 | <paths> |
|
285 | <paths> | |
| 286 | </paths> |
|
286 | </paths> | |
| 287 | <extra key="branch">default</extra> |
|
287 | <extra key="branch">default</extra> | |
| 288 | </logentry> |
|
288 | </logentry> | |
| 289 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> |
|
289 | <logentry revision="5" node="13207e5a10d9fd28ec424934298e176197f2c67f"> | |
| 290 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
290 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> | |
| 291 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
291 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
| 292 | <author email="person">person</author> |
|
292 | <author email="person">person</author> | |
| 293 | <date>1970-01-18T08:40:00+00:00</date> |
|
293 | <date>1970-01-18T08:40:00+00:00</date> | |
| 294 | <msg xml:space="preserve">new head</msg> |
|
294 | <msg xml:space="preserve">new head</msg> | |
| 295 | <paths> |
|
295 | <paths> | |
| 296 | <path action="A">d</path> |
|
296 | <path action="A">d</path> | |
| 297 | </paths> |
|
297 | </paths> | |
| 298 | <extra key="branch">default</extra> |
|
298 | <extra key="branch">default</extra> | |
| 299 | </logentry> |
|
299 | </logentry> | |
| 300 | <logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4"> |
|
300 | <logentry revision="4" node="32a18f097fcccf76ef282f62f8a85b3adf8d13c4"> | |
| 301 | <branch>foo</branch> |
|
301 | <branch>foo</branch> | |
| 302 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> |
|
302 | <parent revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47" /> | |
| 303 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
303 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
| 304 | <author email="person">person</author> |
|
304 | <author email="person">person</author> | |
| 305 | <date>1970-01-17T04:53:20+00:00</date> |
|
305 | <date>1970-01-17T04:53:20+00:00</date> | |
| 306 | <msg xml:space="preserve">new branch</msg> |
|
306 | <msg xml:space="preserve">new branch</msg> | |
| 307 | <paths> |
|
307 | <paths> | |
| 308 | </paths> |
|
308 | </paths> | |
| 309 | <extra key="branch">foo</extra> |
|
309 | <extra key="branch">foo</extra> | |
| 310 | </logentry> |
|
310 | </logentry> | |
| 311 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> |
|
311 | <logentry revision="3" node="10e46f2dcbf4823578cf180f33ecf0b957964c47"> | |
| 312 | <parent revision="2" node="97054abb4ab824450e9164180baf491ae0078465" /> |
|
312 | <parent revision="2" node="97054abb4ab824450e9164180baf491ae0078465" /> | |
| 313 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
313 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
| 314 | <author email="person">person</author> |
|
314 | <author email="person">person</author> | |
| 315 | <date>1970-01-16T01:06:40+00:00</date> |
|
315 | <date>1970-01-16T01:06:40+00:00</date> | |
| 316 | <msg xml:space="preserve">no user, no domain</msg> |
|
316 | <msg xml:space="preserve">no user, no domain</msg> | |
| 317 | <paths> |
|
317 | <paths> | |
| 318 | <path action="M">c</path> |
|
318 | <path action="M">c</path> | |
| 319 | </paths> |
|
319 | </paths> | |
| 320 | <extra key="branch">default</extra> |
|
320 | <extra key="branch">default</extra> | |
| 321 | </logentry> |
|
321 | </logentry> | |
| 322 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> |
|
322 | <logentry revision="2" node="97054abb4ab824450e9164180baf491ae0078465"> | |
| 323 | <parent revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965" /> |
|
323 | <parent revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965" /> | |
| 324 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
324 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
| 325 | <author email="other@place">other</author> |
|
325 | <author email="other@place">other</author> | |
| 326 | <date>1970-01-14T21:20:00+00:00</date> |
|
326 | <date>1970-01-14T21:20:00+00:00</date> | |
| 327 | <msg xml:space="preserve">no person</msg> |
|
327 | <msg xml:space="preserve">no person</msg> | |
| 328 | <paths> |
|
328 | <paths> | |
| 329 | <path action="A">c</path> |
|
329 | <path action="A">c</path> | |
| 330 | </paths> |
|
330 | </paths> | |
| 331 | <extra key="branch">default</extra> |
|
331 | <extra key="branch">default</extra> | |
| 332 | </logentry> |
|
332 | </logentry> | |
| 333 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> |
|
333 | <logentry revision="1" node="b608e9d1a3f0273ccf70fb85fd6866b3482bf965"> | |
| 334 | <parent revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f" /> |
|
334 | <parent revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f" /> | |
| 335 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
335 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
| 336 | <author email="other@place">A. N. Other</author> |
|
336 | <author email="other@place">A. N. Other</author> | |
| 337 | <date>1970-01-13T17:33:20+00:00</date> |
|
337 | <date>1970-01-13T17:33:20+00:00</date> | |
| 338 | <msg xml:space="preserve">other 1 |
|
338 | <msg xml:space="preserve">other 1 | |
| 339 | other 2 |
|
339 | other 2 | |
| 340 |
|
340 | |||
| 341 | other 3</msg> |
|
341 | other 3</msg> | |
| 342 | <paths> |
|
342 | <paths> | |
| 343 | <path action="A">b</path> |
|
343 | <path action="A">b</path> | |
| 344 | </paths> |
|
344 | </paths> | |
| 345 | <extra key="branch">default</extra> |
|
345 | <extra key="branch">default</extra> | |
| 346 | </logentry> |
|
346 | </logentry> | |
| 347 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> |
|
347 | <logentry revision="0" node="1e4e1b8f71e05681d422154f5421e385fec3454f"> | |
| 348 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
348 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
| 349 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> |
|
349 | <parent revision="-1" node="0000000000000000000000000000000000000000" /> | |
| 350 | <author email="user@hostname">User Name</author> |
|
350 | <author email="user@hostname">User Name</author> | |
| 351 | <date>1970-01-12T13:46:40+00:00</date> |
|
351 | <date>1970-01-12T13:46:40+00:00</date> | |
| 352 | <msg xml:space="preserve">line 1 |
|
352 | <msg xml:space="preserve">line 1 | |
| 353 | line 2</msg> |
|
353 | line 2</msg> | |
| 354 | <paths> |
|
354 | <paths> | |
| 355 | <path action="A">a</path> |
|
355 | <path action="A">a</path> | |
| 356 | </paths> |
|
356 | </paths> | |
| 357 | <extra key="branch">default</extra> |
|
357 | <extra key="branch">default</extra> | |
| 358 | </logentry> |
|
358 | </logentry> | |
| 359 | </log> |
|
359 | </log> | |
| 360 | # error if style not readable |
|
360 | # error if style not readable | |
| 361 | abort: Permission denied: ./q |
|
361 | abort: Permission denied: ./q | |
| 362 | # error if no style |
|
362 | # error if no style | |
| 363 | abort: style not found: notexist |
|
363 | abort: style not found: notexist | |
| 364 | # error if style missing key |
|
364 | # error if style missing key | |
| 365 | abort: ./t: no key named 'changeset' |
|
365 | abort: ./t: no key named 'changeset' | |
| 366 | # error if include fails |
|
366 | # error if include fails | |
| 367 | abort: template file ./q: Permission denied |
|
367 | abort: template file ./q: Permission denied | |
| 368 | # include works |
|
368 | # include works | |
| 369 | 8 |
|
369 | 8 | |
| 370 | 7 |
|
370 | 7 | |
| 371 | 6 |
|
371 | 6 | |
| 372 | 5 |
|
372 | 5 | |
| 373 | 4 |
|
373 | 4 | |
| 374 | 3 |
|
374 | 3 | |
| 375 | 2 |
|
375 | 2 | |
| 376 | 1 |
|
376 | 1 | |
| 377 | 0 |
|
377 | 0 | |
| 378 | # ui.style works |
|
378 | # ui.style works | |
| 379 | 8 |
|
379 | 8 | |
| 380 | 7 |
|
380 | 7 | |
| 381 | 6 |
|
381 | 6 | |
| 382 | 5 |
|
382 | 5 | |
| 383 | 4 |
|
383 | 4 | |
| 384 | 3 |
|
384 | 3 | |
| 385 | 2 |
|
385 | 2 | |
| 386 | 1 |
|
386 | 1 | |
| 387 | 0 |
|
387 | 0 | |
| 388 | # issue338 |
|
388 | # issue338 | |
| 389 | 2020-01-01 test <test> |
|
389 | 2020-01-01 test <test> | |
| 390 |
|
390 | |||
| 391 | * fourth, second, third: |
|
391 | * fourth, second, third: | |
| 392 | third |
|
392 | third | |
| 393 | [3bdecc1cde0c] [tip] |
|
393 | [95c24699272e] [tip] | |
| 394 |
|
394 | |||
| 395 | 1970-01-12 User Name <user@hostname> |
|
395 | 1970-01-12 User Name <user@hostname> | |
| 396 |
|
396 | |||
| 397 | * second: |
|
397 | * second: | |
| 398 | second |
|
398 | second | |
| 399 | [29114dbae42b] |
|
399 | [29114dbae42b] | |
| 400 |
|
400 | |||
| 401 | 1970-01-18 person <person> |
|
401 | 1970-01-18 person <person> | |
| 402 |
|
402 | |||
| 403 | * merge |
|
403 | * merge | |
| 404 | [c7b487c6c50e] |
|
404 | [c7b487c6c50e] | |
| 405 |
|
405 | |||
| 406 | * d: |
|
406 | * d: | |
| 407 | new head |
|
407 | new head | |
| 408 | [13207e5a10d9] |
|
408 | [13207e5a10d9] | |
| 409 |
|
409 | |||
| 410 | 1970-01-17 person <person> |
|
410 | 1970-01-17 person <person> | |
| 411 |
|
411 | |||
| 412 | * new branch |
|
412 | * new branch | |
| 413 | [32a18f097fcc] <foo> |
|
413 | [32a18f097fcc] <foo> | |
| 414 |
|
414 | |||
| 415 | 1970-01-16 person <person> |
|
415 | 1970-01-16 person <person> | |
| 416 |
|
416 | |||
| 417 | * c: |
|
417 | * c: | |
| 418 | no user, no domain |
|
418 | no user, no domain | |
| 419 | [10e46f2dcbf4] |
|
419 | [10e46f2dcbf4] | |
| 420 |
|
420 | |||
| 421 | 1970-01-14 other <other@place> |
|
421 | 1970-01-14 other <other@place> | |
| 422 |
|
422 | |||
| 423 | * c: |
|
423 | * c: | |
| 424 | no person |
|
424 | no person | |
| 425 | [97054abb4ab8] |
|
425 | [97054abb4ab8] | |
| 426 |
|
426 | |||
| 427 | 1970-01-13 A. N. Other <other@place> |
|
427 | 1970-01-13 A. N. Other <other@place> | |
| 428 |
|
428 | |||
| 429 | * b: |
|
429 | * b: | |
| 430 | other 1 other 2 |
|
430 | other 1 other 2 | |
| 431 |
|
431 | |||
| 432 | other 3 |
|
432 | other 3 | |
| 433 | [b608e9d1a3f0] |
|
433 | [b608e9d1a3f0] | |
| 434 |
|
434 | |||
| 435 | 1970-01-12 User Name <user@hostname> |
|
435 | 1970-01-12 User Name <user@hostname> | |
| 436 |
|
436 | |||
| 437 | * a: |
|
437 | * a: | |
| 438 | line 1 line 2 |
|
438 | line 1 line 2 | |
| 439 | [1e4e1b8f71e0] |
|
439 | [1e4e1b8f71e0] | |
| 440 |
|
440 | |||
| 441 | # keys work |
|
441 | # keys work | |
| 442 | author: test |
|
442 | author: test | |
| 443 | author: User Name <user@hostname> |
|
443 | author: User Name <user@hostname> | |
| 444 | author: person |
|
444 | author: person | |
| 445 | author: person |
|
445 | author: person | |
| 446 | author: person |
|
446 | author: person | |
| 447 | author: person |
|
447 | author: person | |
| 448 | author: other@place |
|
448 | author: other@place | |
| 449 | author: A. N. Other <other@place> |
|
449 | author: A. N. Other <other@place> | |
| 450 | author: User Name <user@hostname> |
|
450 | author: User Name <user@hostname> | |
| 451 | author--verbose: test |
|
451 | author--verbose: test | |
| 452 | author--verbose: User Name <user@hostname> |
|
452 | author--verbose: User Name <user@hostname> | |
| 453 | author--verbose: person |
|
453 | author--verbose: person | |
| 454 | author--verbose: person |
|
454 | author--verbose: person | |
| 455 | author--verbose: person |
|
455 | author--verbose: person | |
| 456 | author--verbose: person |
|
456 | author--verbose: person | |
| 457 | author--verbose: other@place |
|
457 | author--verbose: other@place | |
| 458 | author--verbose: A. N. Other <other@place> |
|
458 | author--verbose: A. N. Other <other@place> | |
| 459 | author--verbose: User Name <user@hostname> |
|
459 | author--verbose: User Name <user@hostname> | |
| 460 | author--debug: test |
|
460 | author--debug: test | |
| 461 | author--debug: User Name <user@hostname> |
|
461 | author--debug: User Name <user@hostname> | |
| 462 | author--debug: person |
|
462 | author--debug: person | |
| 463 | author--debug: person |
|
463 | author--debug: person | |
| 464 | author--debug: person |
|
464 | author--debug: person | |
| 465 | author--debug: person |
|
465 | author--debug: person | |
| 466 | author--debug: other@place |
|
466 | author--debug: other@place | |
| 467 | author--debug: A. N. Other <other@place> |
|
467 | author--debug: A. N. Other <other@place> | |
| 468 | author--debug: User Name <user@hostname> |
|
468 | author--debug: User Name <user@hostname> | |
| 469 | branches: |
|
469 | branches: | |
| 470 | branches: |
|
470 | branches: | |
| 471 | branches: |
|
471 | branches: | |
| 472 | branches: |
|
472 | branches: | |
| 473 | branches: foo |
|
473 | branches: foo | |
| 474 | branches: |
|
474 | branches: | |
| 475 | branches: |
|
475 | branches: | |
| 476 | branches: |
|
476 | branches: | |
| 477 | branches: |
|
477 | branches: | |
| 478 | branches--verbose: |
|
478 | branches--verbose: | |
| 479 | branches--verbose: |
|
479 | branches--verbose: | |
| 480 | branches--verbose: |
|
480 | branches--verbose: | |
| 481 | branches--verbose: |
|
481 | branches--verbose: | |
| 482 | branches--verbose: foo |
|
482 | branches--verbose: foo | |
| 483 | branches--verbose: |
|
483 | branches--verbose: | |
| 484 | branches--verbose: |
|
484 | branches--verbose: | |
| 485 | branches--verbose: |
|
485 | branches--verbose: | |
| 486 | branches--verbose: |
|
486 | branches--verbose: | |
| 487 | branches--debug: |
|
487 | branches--debug: | |
| 488 | branches--debug: |
|
488 | branches--debug: | |
| 489 | branches--debug: |
|
489 | branches--debug: | |
| 490 | branches--debug: |
|
490 | branches--debug: | |
| 491 | branches--debug: foo |
|
491 | branches--debug: foo | |
| 492 | branches--debug: |
|
492 | branches--debug: | |
| 493 | branches--debug: |
|
493 | branches--debug: | |
| 494 | branches--debug: |
|
494 | branches--debug: | |
| 495 | branches--debug: |
|
495 | branches--debug: | |
| 496 | date: 1577872860.00 |
|
496 | date: 1577872860.00 | |
| 497 | date: 1000000.00 |
|
497 | date: 1000000.00 | |
| 498 | date: 1500001.00 |
|
498 | date: 1500001.00 | |
| 499 | date: 1500000.00 |
|
499 | date: 1500000.00 | |
| 500 | date: 1400000.00 |
|
500 | date: 1400000.00 | |
| 501 | date: 1300000.00 |
|
501 | date: 1300000.00 | |
| 502 | date: 1200000.00 |
|
502 | date: 1200000.00 | |
| 503 | date: 1100000.00 |
|
503 | date: 1100000.00 | |
| 504 | date: 1000000.00 |
|
504 | date: 1000000.00 | |
| 505 | date--verbose: 1577872860.00 |
|
505 | date--verbose: 1577872860.00 | |
| 506 | date--verbose: 1000000.00 |
|
506 | date--verbose: 1000000.00 | |
| 507 | date--verbose: 1500001.00 |
|
507 | date--verbose: 1500001.00 | |
| 508 | date--verbose: 1500000.00 |
|
508 | date--verbose: 1500000.00 | |
| 509 | date--verbose: 1400000.00 |
|
509 | date--verbose: 1400000.00 | |
| 510 | date--verbose: 1300000.00 |
|
510 | date--verbose: 1300000.00 | |
| 511 | date--verbose: 1200000.00 |
|
511 | date--verbose: 1200000.00 | |
| 512 | date--verbose: 1100000.00 |
|
512 | date--verbose: 1100000.00 | |
| 513 | date--verbose: 1000000.00 |
|
513 | date--verbose: 1000000.00 | |
| 514 | date--debug: 1577872860.00 |
|
514 | date--debug: 1577872860.00 | |
| 515 | date--debug: 1000000.00 |
|
515 | date--debug: 1000000.00 | |
| 516 | date--debug: 1500001.00 |
|
516 | date--debug: 1500001.00 | |
| 517 | date--debug: 1500000.00 |
|
517 | date--debug: 1500000.00 | |
| 518 | date--debug: 1400000.00 |
|
518 | date--debug: 1400000.00 | |
| 519 | date--debug: 1300000.00 |
|
519 | date--debug: 1300000.00 | |
| 520 | date--debug: 1200000.00 |
|
520 | date--debug: 1200000.00 | |
| 521 | date--debug: 1100000.00 |
|
521 | date--debug: 1100000.00 | |
| 522 | date--debug: 1000000.00 |
|
522 | date--debug: 1000000.00 | |
| 523 | desc: third |
|
523 | desc: third | |
| 524 | desc: second |
|
524 | desc: second | |
| 525 | desc: merge |
|
525 | desc: merge | |
| 526 | desc: new head |
|
526 | desc: new head | |
| 527 | desc: new branch |
|
527 | desc: new branch | |
| 528 | desc: no user, no domain |
|
528 | desc: no user, no domain | |
| 529 | desc: no person |
|
529 | desc: no person | |
| 530 | desc: other 1 |
|
530 | desc: other 1 | |
| 531 | other 2 |
|
531 | other 2 | |
| 532 |
|
532 | |||
| 533 | other 3 |
|
533 | other 3 | |
| 534 | desc: line 1 |
|
534 | desc: line 1 | |
| 535 | line 2 |
|
535 | line 2 | |
| 536 | desc--verbose: third |
|
536 | desc--verbose: third | |
| 537 | desc--verbose: second |
|
537 | desc--verbose: second | |
| 538 | desc--verbose: merge |
|
538 | desc--verbose: merge | |
| 539 | desc--verbose: new head |
|
539 | desc--verbose: new head | |
| 540 | desc--verbose: new branch |
|
540 | desc--verbose: new branch | |
| 541 | desc--verbose: no user, no domain |
|
541 | desc--verbose: no user, no domain | |
| 542 | desc--verbose: no person |
|
542 | desc--verbose: no person | |
| 543 | desc--verbose: other 1 |
|
543 | desc--verbose: other 1 | |
| 544 | other 2 |
|
544 | other 2 | |
| 545 |
|
545 | |||
| 546 | other 3 |
|
546 | other 3 | |
| 547 | desc--verbose: line 1 |
|
547 | desc--verbose: line 1 | |
| 548 | line 2 |
|
548 | line 2 | |
| 549 | desc--debug: third |
|
549 | desc--debug: third | |
| 550 | desc--debug: second |
|
550 | desc--debug: second | |
| 551 | desc--debug: merge |
|
551 | desc--debug: merge | |
| 552 | desc--debug: new head |
|
552 | desc--debug: new head | |
| 553 | desc--debug: new branch |
|
553 | desc--debug: new branch | |
| 554 | desc--debug: no user, no domain |
|
554 | desc--debug: no user, no domain | |
| 555 | desc--debug: no person |
|
555 | desc--debug: no person | |
| 556 | desc--debug: other 1 |
|
556 | desc--debug: other 1 | |
| 557 | other 2 |
|
557 | other 2 | |
| 558 |
|
558 | |||
| 559 | other 3 |
|
559 | other 3 | |
| 560 | desc--debug: line 1 |
|
560 | desc--debug: line 1 | |
| 561 | line 2 |
|
561 | line 2 | |
| 562 | file_adds: fourth third |
|
562 | file_adds: fourth third | |
| 563 | file_adds: second |
|
563 | file_adds: second | |
| 564 | file_adds: |
|
564 | file_adds: | |
| 565 | file_adds: d |
|
565 | file_adds: d | |
| 566 | file_adds: |
|
566 | file_adds: | |
| 567 | file_adds: |
|
567 | file_adds: | |
| 568 | file_adds: c |
|
568 | file_adds: c | |
| 569 | file_adds: b |
|
569 | file_adds: b | |
| 570 | file_adds: a |
|
570 | file_adds: a | |
| 571 | file_adds--verbose: fourth third |
|
571 | file_adds--verbose: fourth third | |
| 572 | file_adds--verbose: second |
|
572 | file_adds--verbose: second | |
| 573 | file_adds--verbose: |
|
573 | file_adds--verbose: | |
| 574 | file_adds--verbose: d |
|
574 | file_adds--verbose: d | |
| 575 | file_adds--verbose: |
|
575 | file_adds--verbose: | |
| 576 | file_adds--verbose: |
|
576 | file_adds--verbose: | |
| 577 | file_adds--verbose: c |
|
577 | file_adds--verbose: c | |
| 578 | file_adds--verbose: b |
|
578 | file_adds--verbose: b | |
| 579 | file_adds--verbose: a |
|
579 | file_adds--verbose: a | |
| 580 | file_adds--debug: fourth third |
|
580 | file_adds--debug: fourth third | |
| 581 | file_adds--debug: second |
|
581 | file_adds--debug: second | |
| 582 | file_adds--debug: |
|
582 | file_adds--debug: | |
| 583 | file_adds--debug: d |
|
583 | file_adds--debug: d | |
| 584 | file_adds--debug: |
|
584 | file_adds--debug: | |
| 585 | file_adds--debug: |
|
585 | file_adds--debug: | |
| 586 | file_adds--debug: c |
|
586 | file_adds--debug: c | |
| 587 | file_adds--debug: b |
|
587 | file_adds--debug: b | |
| 588 | file_adds--debug: a |
|
588 | file_adds--debug: a | |
| 589 | file_dels: second |
|
589 | file_dels: second | |
| 590 | file_dels: |
|
590 | file_dels: | |
| 591 | file_dels: |
|
591 | file_dels: | |
| 592 | file_dels: |
|
592 | file_dels: | |
| 593 | file_dels: |
|
593 | file_dels: | |
| 594 | file_dels: |
|
594 | file_dels: | |
| 595 | file_dels: |
|
595 | file_dels: | |
| 596 | file_dels: |
|
596 | file_dels: | |
| 597 | file_dels: |
|
597 | file_dels: | |
| 598 | file_dels--verbose: second |
|
598 | file_dels--verbose: second | |
| 599 | file_dels--verbose: |
|
599 | file_dels--verbose: | |
| 600 | file_dels--verbose: |
|
600 | file_dels--verbose: | |
| 601 | file_dels--verbose: |
|
601 | file_dels--verbose: | |
| 602 | file_dels--verbose: |
|
602 | file_dels--verbose: | |
| 603 | file_dels--verbose: |
|
603 | file_dels--verbose: | |
| 604 | file_dels--verbose: |
|
604 | file_dels--verbose: | |
| 605 | file_dels--verbose: |
|
605 | file_dels--verbose: | |
| 606 | file_dels--verbose: |
|
606 | file_dels--verbose: | |
| 607 | file_dels--debug: second |
|
607 | file_dels--debug: second | |
| 608 | file_dels--debug: |
|
608 | file_dels--debug: | |
| 609 | file_dels--debug: |
|
609 | file_dels--debug: | |
| 610 | file_dels--debug: |
|
610 | file_dels--debug: | |
| 611 | file_dels--debug: |
|
611 | file_dels--debug: | |
| 612 | file_dels--debug: |
|
612 | file_dels--debug: | |
| 613 | file_dels--debug: |
|
613 | file_dels--debug: | |
| 614 | file_dels--debug: |
|
614 | file_dels--debug: | |
| 615 | file_dels--debug: |
|
615 | file_dels--debug: | |
| 616 | file_mods: |
|
616 | file_mods: | |
| 617 | file_mods: |
|
617 | file_mods: | |
| 618 | file_mods: |
|
618 | file_mods: | |
| 619 | file_mods: |
|
619 | file_mods: | |
| 620 | file_mods: |
|
620 | file_mods: | |
| 621 | file_mods: c |
|
621 | file_mods: c | |
| 622 | file_mods: |
|
622 | file_mods: | |
| 623 | file_mods: |
|
623 | file_mods: | |
| 624 | file_mods: |
|
624 | file_mods: | |
| 625 | file_mods--verbose: |
|
625 | file_mods--verbose: | |
| 626 | file_mods--verbose: |
|
626 | file_mods--verbose: | |
| 627 | file_mods--verbose: |
|
627 | file_mods--verbose: | |
| 628 | file_mods--verbose: |
|
628 | file_mods--verbose: | |
| 629 | file_mods--verbose: |
|
629 | file_mods--verbose: | |
| 630 | file_mods--verbose: c |
|
630 | file_mods--verbose: c | |
| 631 | file_mods--verbose: |
|
631 | file_mods--verbose: | |
| 632 | file_mods--verbose: |
|
632 | file_mods--verbose: | |
| 633 | file_mods--verbose: |
|
633 | file_mods--verbose: | |
| 634 | file_mods--debug: |
|
634 | file_mods--debug: | |
| 635 | file_mods--debug: |
|
635 | file_mods--debug: | |
| 636 | file_mods--debug: |
|
636 | file_mods--debug: | |
| 637 | file_mods--debug: |
|
637 | file_mods--debug: | |
| 638 | file_mods--debug: |
|
638 | file_mods--debug: | |
| 639 | file_mods--debug: c |
|
639 | file_mods--debug: c | |
| 640 | file_mods--debug: |
|
640 | file_mods--debug: | |
| 641 | file_mods--debug: |
|
641 | file_mods--debug: | |
| 642 | file_mods--debug: |
|
642 | file_mods--debug: | |
| 643 | file_copies: fourth (second) |
|
643 | file_copies: fourth (second) | |
| 644 | file_copies: |
|
644 | file_copies: | |
| 645 | file_copies: |
|
645 | file_copies: | |
| 646 | file_copies: |
|
646 | file_copies: | |
| 647 | file_copies: |
|
647 | file_copies: | |
| 648 | file_copies: |
|
648 | file_copies: | |
| 649 | file_copies: |
|
649 | file_copies: | |
| 650 | file_copies: |
|
650 | file_copies: | |
| 651 | file_copies: |
|
651 | file_copies: | |
| 652 | file_copies--verbose: fourth (second) |
|
652 | file_copies--verbose: fourth (second) | |
| 653 | file_copies--verbose: |
|
653 | file_copies--verbose: | |
| 654 | file_copies--verbose: |
|
654 | file_copies--verbose: | |
| 655 | file_copies--verbose: |
|
655 | file_copies--verbose: | |
| 656 | file_copies--verbose: |
|
656 | file_copies--verbose: | |
| 657 | file_copies--verbose: |
|
657 | file_copies--verbose: | |
| 658 | file_copies--verbose: |
|
658 | file_copies--verbose: | |
| 659 | file_copies--verbose: |
|
659 | file_copies--verbose: | |
| 660 | file_copies--verbose: |
|
660 | file_copies--verbose: | |
| 661 | file_copies--debug: fourth (second) |
|
661 | file_copies--debug: fourth (second) | |
| 662 | file_copies--debug: |
|
662 | file_copies--debug: | |
| 663 | file_copies--debug: |
|
663 | file_copies--debug: | |
| 664 | file_copies--debug: |
|
664 | file_copies--debug: | |
| 665 | file_copies--debug: |
|
665 | file_copies--debug: | |
| 666 | file_copies--debug: |
|
666 | file_copies--debug: | |
| 667 | file_copies--debug: |
|
667 | file_copies--debug: | |
| 668 | file_copies--debug: |
|
668 | file_copies--debug: | |
| 669 | file_copies--debug: |
|
669 | file_copies--debug: | |
| 670 | file_copies_switch: |
|
670 | file_copies_switch: | |
| 671 | file_copies_switch: |
|
671 | file_copies_switch: | |
| 672 | file_copies_switch: |
|
672 | file_copies_switch: | |
| 673 | file_copies_switch: |
|
673 | file_copies_switch: | |
| 674 | file_copies_switch: |
|
674 | file_copies_switch: | |
| 675 | file_copies_switch: |
|
675 | file_copies_switch: | |
| 676 | file_copies_switch: |
|
676 | file_copies_switch: | |
| 677 | file_copies_switch: |
|
677 | file_copies_switch: | |
| 678 | file_copies_switch: |
|
678 | file_copies_switch: | |
| 679 | file_copies_switch--verbose: |
|
679 | file_copies_switch--verbose: | |
| 680 | file_copies_switch--verbose: |
|
680 | file_copies_switch--verbose: | |
| 681 | file_copies_switch--verbose: |
|
681 | file_copies_switch--verbose: | |
| 682 | file_copies_switch--verbose: |
|
682 | file_copies_switch--verbose: | |
| 683 | file_copies_switch--verbose: |
|
683 | file_copies_switch--verbose: | |
| 684 | file_copies_switch--verbose: |
|
684 | file_copies_switch--verbose: | |
| 685 | file_copies_switch--verbose: |
|
685 | file_copies_switch--verbose: | |
| 686 | file_copies_switch--verbose: |
|
686 | file_copies_switch--verbose: | |
| 687 | file_copies_switch--verbose: |
|
687 | file_copies_switch--verbose: | |
| 688 | file_copies_switch--debug: |
|
688 | file_copies_switch--debug: | |
| 689 | file_copies_switch--debug: |
|
689 | file_copies_switch--debug: | |
| 690 | file_copies_switch--debug: |
|
690 | file_copies_switch--debug: | |
| 691 | file_copies_switch--debug: |
|
691 | file_copies_switch--debug: | |
| 692 | file_copies_switch--debug: |
|
692 | file_copies_switch--debug: | |
| 693 | file_copies_switch--debug: |
|
693 | file_copies_switch--debug: | |
| 694 | file_copies_switch--debug: |
|
694 | file_copies_switch--debug: | |
| 695 | file_copies_switch--debug: |
|
695 | file_copies_switch--debug: | |
| 696 | file_copies_switch--debug: |
|
696 | file_copies_switch--debug: | |
| 697 | files: fourth second third |
|
697 | files: fourth second third | |
| 698 | files: second |
|
698 | files: second | |
| 699 | files: |
|
699 | files: | |
| 700 | files: d |
|
700 | files: d | |
| 701 | files: |
|
701 | files: | |
| 702 | files: c |
|
702 | files: c | |
| 703 | files: c |
|
703 | files: c | |
| 704 | files: b |
|
704 | files: b | |
| 705 | files: a |
|
705 | files: a | |
| 706 | files--verbose: fourth second third |
|
706 | files--verbose: fourth second third | |
| 707 | files--verbose: second |
|
707 | files--verbose: second | |
| 708 | files--verbose: |
|
708 | files--verbose: | |
| 709 | files--verbose: d |
|
709 | files--verbose: d | |
| 710 | files--verbose: |
|
710 | files--verbose: | |
| 711 | files--verbose: c |
|
711 | files--verbose: c | |
| 712 | files--verbose: c |
|
712 | files--verbose: c | |
| 713 | files--verbose: b |
|
713 | files--verbose: b | |
| 714 | files--verbose: a |
|
714 | files--verbose: a | |
| 715 | files--debug: fourth second third |
|
715 | files--debug: fourth second third | |
| 716 | files--debug: second |
|
716 | files--debug: second | |
| 717 | files--debug: |
|
717 | files--debug: | |
| 718 | files--debug: d |
|
718 | files--debug: d | |
| 719 | files--debug: |
|
719 | files--debug: | |
| 720 | files--debug: c |
|
720 | files--debug: c | |
| 721 | files--debug: c |
|
721 | files--debug: c | |
| 722 | files--debug: b |
|
722 | files--debug: b | |
| 723 | files--debug: a |
|
723 | files--debug: a | |
| 724 |
manifest: 8: |
|
724 | manifest: 8:94961b75a2da | |
| 725 | manifest: 7:f2dbc354b94e |
|
725 | manifest: 7:f2dbc354b94e | |
| 726 | manifest: 6:91015e9dbdd7 |
|
726 | manifest: 6:91015e9dbdd7 | |
| 727 | manifest: 5:4dc3def4f9b4 |
|
727 | manifest: 5:4dc3def4f9b4 | |
| 728 | manifest: 4:90ae8dda64e1 |
|
728 | manifest: 4:90ae8dda64e1 | |
| 729 | manifest: 3:cb5a1327723b |
|
729 | manifest: 3:cb5a1327723b | |
| 730 | manifest: 2:6e0e82995c35 |
|
730 | manifest: 2:6e0e82995c35 | |
| 731 | manifest: 1:4e8d705b1e53 |
|
731 | manifest: 1:4e8d705b1e53 | |
| 732 | manifest: 0:a0c8bcbbb45c |
|
732 | manifest: 0:a0c8bcbbb45c | |
| 733 |
manifest--verbose: 8: |
|
733 | manifest--verbose: 8:94961b75a2da | |
| 734 | manifest--verbose: 7:f2dbc354b94e |
|
734 | manifest--verbose: 7:f2dbc354b94e | |
| 735 | manifest--verbose: 6:91015e9dbdd7 |
|
735 | manifest--verbose: 6:91015e9dbdd7 | |
| 736 | manifest--verbose: 5:4dc3def4f9b4 |
|
736 | manifest--verbose: 5:4dc3def4f9b4 | |
| 737 | manifest--verbose: 4:90ae8dda64e1 |
|
737 | manifest--verbose: 4:90ae8dda64e1 | |
| 738 | manifest--verbose: 3:cb5a1327723b |
|
738 | manifest--verbose: 3:cb5a1327723b | |
| 739 | manifest--verbose: 2:6e0e82995c35 |
|
739 | manifest--verbose: 2:6e0e82995c35 | |
| 740 | manifest--verbose: 1:4e8d705b1e53 |
|
740 | manifest--verbose: 1:4e8d705b1e53 | |
| 741 | manifest--verbose: 0:a0c8bcbbb45c |
|
741 | manifest--verbose: 0:a0c8bcbbb45c | |
| 742 | manifest--debug: 8:79c71159cb0a1a84add78e7922a1e5e7be34c499 |
|
742 | manifest--debug: 8:94961b75a2da554b4df6fb599e5bfc7d48de0c64 | |
| 743 | manifest--debug: 7:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf |
|
743 | manifest--debug: 7:f2dbc354b94e5ec0b4f10680ee0cee816101d0bf | |
| 744 | manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf |
|
744 | manifest--debug: 6:91015e9dbdd76a6791085d12b0a0ec7fcd22ffbf | |
| 745 | manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 |
|
745 | manifest--debug: 5:4dc3def4f9b4c6e8de820f6ee74737f91e96a216 | |
| 746 | manifest--debug: 4:90ae8dda64e1a876c792bccb9af66284f6018363 |
|
746 | manifest--debug: 4:90ae8dda64e1a876c792bccb9af66284f6018363 | |
| 747 | manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc |
|
747 | manifest--debug: 3:cb5a1327723bada42f117e4c55a303246eaf9ccc | |
| 748 | manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 |
|
748 | manifest--debug: 2:6e0e82995c35d0d57a52aca8da4e56139e06b4b1 | |
| 749 | manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 |
|
749 | manifest--debug: 1:4e8d705b1e53e3f9375e0e60dc7b525d8211fe55 | |
| 750 | manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
750 | manifest--debug: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 | |
| 751 | node: 3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57 |
|
751 | node: 95c24699272ef57d062b8bccc32c878bf841784a | |
| 752 | node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
752 | node: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 | |
| 753 | node: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f |
|
753 | node: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f | |
| 754 | node: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
754 | node: 13207e5a10d9fd28ec424934298e176197f2c67f | |
| 755 | node: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 |
|
755 | node: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 | |
| 756 | node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
756 | node: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
| 757 | node: 97054abb4ab824450e9164180baf491ae0078465 |
|
757 | node: 97054abb4ab824450e9164180baf491ae0078465 | |
| 758 | node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
758 | node: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
| 759 | node: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
759 | node: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
| 760 | node--verbose: 3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57 |
|
760 | node--verbose: 95c24699272ef57d062b8bccc32c878bf841784a | |
| 761 | node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
761 | node--verbose: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 | |
| 762 | node--verbose: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f |
|
762 | node--verbose: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f | |
| 763 | node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
763 | node--verbose: 13207e5a10d9fd28ec424934298e176197f2c67f | |
| 764 | node--verbose: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 |
|
764 | node--verbose: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 | |
| 765 | node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
765 | node--verbose: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
| 766 | node--verbose: 97054abb4ab824450e9164180baf491ae0078465 |
|
766 | node--verbose: 97054abb4ab824450e9164180baf491ae0078465 | |
| 767 | node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
767 | node--verbose: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
| 768 | node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
768 | node--verbose: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
| 769 | node--debug: 3bdecc1cde0c3d5fa6eaee3d9d9828f6ac468d57 |
|
769 | node--debug: 95c24699272ef57d062b8bccc32c878bf841784a | |
| 770 | node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 |
|
770 | node--debug: 29114dbae42b9f078cf2714dbe3a86bba8ec7453 | |
| 771 | node--debug: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f |
|
771 | node--debug: c7b487c6c50ef1cf464cafdc4f4f5e615fc5999f | |
| 772 | node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f |
|
772 | node--debug: 13207e5a10d9fd28ec424934298e176197f2c67f | |
| 773 | node--debug: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 |
|
773 | node--debug: 32a18f097fcccf76ef282f62f8a85b3adf8d13c4 | |
| 774 | node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 |
|
774 | node--debug: 10e46f2dcbf4823578cf180f33ecf0b957964c47 | |
| 775 | node--debug: 97054abb4ab824450e9164180baf491ae0078465 |
|
775 | node--debug: 97054abb4ab824450e9164180baf491ae0078465 | |
| 776 | node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 |
|
776 | node--debug: b608e9d1a3f0273ccf70fb85fd6866b3482bf965 | |
| 777 | node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
777 | node--debug: 1e4e1b8f71e05681d422154f5421e385fec3454f | |
| 778 | parents: |
|
778 | parents: | |
| 779 | parents: -1:000000000000 |
|
779 | parents: -1:000000000000 | |
| 780 | parents: 5:13207e5a10d9 4:32a18f097fcc |
|
780 | parents: 5:13207e5a10d9 4:32a18f097fcc | |
| 781 | parents: 3:10e46f2dcbf4 |
|
781 | parents: 3:10e46f2dcbf4 | |
| 782 | parents: |
|
782 | parents: | |
| 783 | parents: |
|
783 | parents: | |
| 784 | parents: |
|
784 | parents: | |
| 785 | parents: |
|
785 | parents: | |
| 786 | parents: |
|
786 | parents: | |
| 787 | parents--verbose: |
|
787 | parents--verbose: | |
| 788 | parents--verbose: -1:000000000000 |
|
788 | parents--verbose: -1:000000000000 | |
| 789 | parents--verbose: 5:13207e5a10d9 4:32a18f097fcc |
|
789 | parents--verbose: 5:13207e5a10d9 4:32a18f097fcc | |
| 790 | parents--verbose: 3:10e46f2dcbf4 |
|
790 | parents--verbose: 3:10e46f2dcbf4 | |
| 791 | parents--verbose: |
|
791 | parents--verbose: | |
| 792 | parents--verbose: |
|
792 | parents--verbose: | |
| 793 | parents--verbose: |
|
793 | parents--verbose: | |
| 794 | parents--verbose: |
|
794 | parents--verbose: | |
| 795 | parents--verbose: |
|
795 | parents--verbose: | |
| 796 | parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 |
|
796 | parents--debug: 7:29114dbae42b9f078cf2714dbe3a86bba8ec7453 -1:0000000000000000000000000000000000000000 | |
| 797 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 |
|
797 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 | |
| 798 | parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:32a18f097fcccf76ef282f62f8a85b3adf8d13c4 |
|
798 | parents--debug: 5:13207e5a10d9fd28ec424934298e176197f2c67f 4:32a18f097fcccf76ef282f62f8a85b3adf8d13c4 | |
| 799 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 |
|
799 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 | |
| 800 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 |
|
800 | parents--debug: 3:10e46f2dcbf4823578cf180f33ecf0b957964c47 -1:0000000000000000000000000000000000000000 | |
| 801 | parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 |
|
801 | parents--debug: 2:97054abb4ab824450e9164180baf491ae0078465 -1:0000000000000000000000000000000000000000 | |
| 802 | parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 |
|
802 | parents--debug: 1:b608e9d1a3f0273ccf70fb85fd6866b3482bf965 -1:0000000000000000000000000000000000000000 | |
| 803 | parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 |
|
803 | parents--debug: 0:1e4e1b8f71e05681d422154f5421e385fec3454f -1:0000000000000000000000000000000000000000 | |
| 804 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 |
|
804 | parents--debug: -1:0000000000000000000000000000000000000000 -1:0000000000000000000000000000000000000000 | |
| 805 | rev: 8 |
|
805 | rev: 8 | |
| 806 | rev: 7 |
|
806 | rev: 7 | |
| 807 | rev: 6 |
|
807 | rev: 6 | |
| 808 | rev: 5 |
|
808 | rev: 5 | |
| 809 | rev: 4 |
|
809 | rev: 4 | |
| 810 | rev: 3 |
|
810 | rev: 3 | |
| 811 | rev: 2 |
|
811 | rev: 2 | |
| 812 | rev: 1 |
|
812 | rev: 1 | |
| 813 | rev: 0 |
|
813 | rev: 0 | |
| 814 | rev--verbose: 8 |
|
814 | rev--verbose: 8 | |
| 815 | rev--verbose: 7 |
|
815 | rev--verbose: 7 | |
| 816 | rev--verbose: 6 |
|
816 | rev--verbose: 6 | |
| 817 | rev--verbose: 5 |
|
817 | rev--verbose: 5 | |
| 818 | rev--verbose: 4 |
|
818 | rev--verbose: 4 | |
| 819 | rev--verbose: 3 |
|
819 | rev--verbose: 3 | |
| 820 | rev--verbose: 2 |
|
820 | rev--verbose: 2 | |
| 821 | rev--verbose: 1 |
|
821 | rev--verbose: 1 | |
| 822 | rev--verbose: 0 |
|
822 | rev--verbose: 0 | |
| 823 | rev--debug: 8 |
|
823 | rev--debug: 8 | |
| 824 | rev--debug: 7 |
|
824 | rev--debug: 7 | |
| 825 | rev--debug: 6 |
|
825 | rev--debug: 6 | |
| 826 | rev--debug: 5 |
|
826 | rev--debug: 5 | |
| 827 | rev--debug: 4 |
|
827 | rev--debug: 4 | |
| 828 | rev--debug: 3 |
|
828 | rev--debug: 3 | |
| 829 | rev--debug: 2 |
|
829 | rev--debug: 2 | |
| 830 | rev--debug: 1 |
|
830 | rev--debug: 1 | |
| 831 | rev--debug: 0 |
|
831 | rev--debug: 0 | |
| 832 | tags: tip |
|
832 | tags: tip | |
| 833 | tags: |
|
833 | tags: | |
| 834 | tags: |
|
834 | tags: | |
| 835 | tags: |
|
835 | tags: | |
| 836 | tags: |
|
836 | tags: | |
| 837 | tags: |
|
837 | tags: | |
| 838 | tags: |
|
838 | tags: | |
| 839 | tags: |
|
839 | tags: | |
| 840 | tags: |
|
840 | tags: | |
| 841 | tags--verbose: tip |
|
841 | tags--verbose: tip | |
| 842 | tags--verbose: |
|
842 | tags--verbose: | |
| 843 | tags--verbose: |
|
843 | tags--verbose: | |
| 844 | tags--verbose: |
|
844 | tags--verbose: | |
| 845 | tags--verbose: |
|
845 | tags--verbose: | |
| 846 | tags--verbose: |
|
846 | tags--verbose: | |
| 847 | tags--verbose: |
|
847 | tags--verbose: | |
| 848 | tags--verbose: |
|
848 | tags--verbose: | |
| 849 | tags--verbose: |
|
849 | tags--verbose: | |
| 850 | tags--debug: tip |
|
850 | tags--debug: tip | |
| 851 | tags--debug: |
|
851 | tags--debug: | |
| 852 | tags--debug: |
|
852 | tags--debug: | |
| 853 | tags--debug: |
|
853 | tags--debug: | |
| 854 | tags--debug: |
|
854 | tags--debug: | |
| 855 | tags--debug: |
|
855 | tags--debug: | |
| 856 | tags--debug: |
|
856 | tags--debug: | |
| 857 | tags--debug: |
|
857 | tags--debug: | |
| 858 | tags--debug: |
|
858 | tags--debug: | |
| 859 | diffstat: 3: +2/-1 |
|
859 | diffstat: 3: +2/-1 | |
| 860 | diffstat: 1: +1/-0 |
|
860 | diffstat: 1: +1/-0 | |
| 861 | diffstat: 0: +0/-0 |
|
861 | diffstat: 0: +0/-0 | |
| 862 | diffstat: 1: +1/-0 |
|
862 | diffstat: 1: +1/-0 | |
| 863 | diffstat: 0: +0/-0 |
|
863 | diffstat: 0: +0/-0 | |
| 864 | diffstat: 1: +1/-0 |
|
864 | diffstat: 1: +1/-0 | |
| 865 | diffstat: 1: +4/-0 |
|
865 | diffstat: 1: +4/-0 | |
| 866 | diffstat: 1: +2/-0 |
|
866 | diffstat: 1: +2/-0 | |
| 867 | diffstat: 1: +1/-0 |
|
867 | diffstat: 1: +1/-0 | |
| 868 | diffstat--verbose: 3: +2/-1 |
|
868 | diffstat--verbose: 3: +2/-1 | |
| 869 | diffstat--verbose: 1: +1/-0 |
|
869 | diffstat--verbose: 1: +1/-0 | |
| 870 | diffstat--verbose: 0: +0/-0 |
|
870 | diffstat--verbose: 0: +0/-0 | |
| 871 | diffstat--verbose: 1: +1/-0 |
|
871 | diffstat--verbose: 1: +1/-0 | |
| 872 | diffstat--verbose: 0: +0/-0 |
|
872 | diffstat--verbose: 0: +0/-0 | |
| 873 | diffstat--verbose: 1: +1/-0 |
|
873 | diffstat--verbose: 1: +1/-0 | |
| 874 | diffstat--verbose: 1: +4/-0 |
|
874 | diffstat--verbose: 1: +4/-0 | |
| 875 | diffstat--verbose: 1: +2/-0 |
|
875 | diffstat--verbose: 1: +2/-0 | |
| 876 | diffstat--verbose: 1: +1/-0 |
|
876 | diffstat--verbose: 1: +1/-0 | |
| 877 | diffstat--debug: 3: +2/-1 |
|
877 | diffstat--debug: 3: +2/-1 | |
| 878 | diffstat--debug: 1: +1/-0 |
|
878 | diffstat--debug: 1: +1/-0 | |
| 879 | diffstat--debug: 0: +0/-0 |
|
879 | diffstat--debug: 0: +0/-0 | |
| 880 | diffstat--debug: 1: +1/-0 |
|
880 | diffstat--debug: 1: +1/-0 | |
| 881 | diffstat--debug: 0: +0/-0 |
|
881 | diffstat--debug: 0: +0/-0 | |
| 882 | diffstat--debug: 1: +1/-0 |
|
882 | diffstat--debug: 1: +1/-0 | |
| 883 | diffstat--debug: 1: +4/-0 |
|
883 | diffstat--debug: 1: +4/-0 | |
| 884 | diffstat--debug: 1: +2/-0 |
|
884 | diffstat--debug: 1: +2/-0 | |
| 885 | diffstat--debug: 1: +1/-0 |
|
885 | diffstat--debug: 1: +1/-0 | |
| 886 | extras: branch=default |
|
886 | extras: branch=default | |
| 887 | extras: branch=default |
|
887 | extras: branch=default | |
| 888 | extras: branch=default |
|
888 | extras: branch=default | |
| 889 | extras: branch=default |
|
889 | extras: branch=default | |
| 890 | extras: branch=foo |
|
890 | extras: branch=foo | |
| 891 | extras: branch=default |
|
891 | extras: branch=default | |
| 892 | extras: branch=default |
|
892 | extras: branch=default | |
| 893 | extras: branch=default |
|
893 | extras: branch=default | |
| 894 | extras: branch=default |
|
894 | extras: branch=default | |
| 895 | extras--verbose: branch=default |
|
895 | extras--verbose: branch=default | |
| 896 | extras--verbose: branch=default |
|
896 | extras--verbose: branch=default | |
| 897 | extras--verbose: branch=default |
|
897 | extras--verbose: branch=default | |
| 898 | extras--verbose: branch=default |
|
898 | extras--verbose: branch=default | |
| 899 | extras--verbose: branch=foo |
|
899 | extras--verbose: branch=foo | |
| 900 | extras--verbose: branch=default |
|
900 | extras--verbose: branch=default | |
| 901 | extras--verbose: branch=default |
|
901 | extras--verbose: branch=default | |
| 902 | extras--verbose: branch=default |
|
902 | extras--verbose: branch=default | |
| 903 | extras--verbose: branch=default |
|
903 | extras--verbose: branch=default | |
| 904 | extras--debug: branch=default |
|
904 | extras--debug: branch=default | |
| 905 | extras--debug: branch=default |
|
905 | extras--debug: branch=default | |
| 906 | extras--debug: branch=default |
|
906 | extras--debug: branch=default | |
| 907 | extras--debug: branch=default |
|
907 | extras--debug: branch=default | |
| 908 | extras--debug: branch=foo |
|
908 | extras--debug: branch=foo | |
| 909 | extras--debug: branch=default |
|
909 | extras--debug: branch=default | |
| 910 | extras--debug: branch=default |
|
910 | extras--debug: branch=default | |
| 911 | extras--debug: branch=default |
|
911 | extras--debug: branch=default | |
| 912 | extras--debug: branch=default |
|
912 | extras--debug: branch=default | |
| 913 | # filters work |
|
913 | # filters work | |
| 914 |
|
914 | |||
| 915 | hostname |
|
915 | hostname | |
| 916 |
|
916 | |||
| 917 |
|
917 | |||
| 918 |
|
918 | |||
| 919 |
|
919 | |||
| 920 | place |
|
920 | place | |
| 921 | place |
|
921 | place | |
| 922 | hostname |
|
922 | hostname | |
| 923 | test |
|
923 | test | |
| 924 | User Name |
|
924 | User Name | |
| 925 | person |
|
925 | person | |
| 926 | person |
|
926 | person | |
| 927 | person |
|
927 | person | |
| 928 | person |
|
928 | person | |
| 929 | other |
|
929 | other | |
| 930 | A. N. Other |
|
930 | A. N. Other | |
| 931 | User Name |
|
931 | User Name | |
| 932 | test |
|
932 | test | |
| 933 | user |
|
933 | user | |
| 934 | person |
|
934 | person | |
| 935 | person |
|
935 | person | |
| 936 | person |
|
936 | person | |
| 937 | person |
|
937 | person | |
| 938 | other |
|
938 | other | |
| 939 | other |
|
939 | other | |
| 940 | user |
|
940 | user | |
| 941 | in the future |
|
941 | in the future | |
| 942 | Wed Jan 01 10:01:00 2020 +0000 |
|
942 | Wed Jan 01 10:01:00 2020 +0000 | |
| 943 | Mon Jan 12 13:46:40 1970 +0000 |
|
943 | Mon Jan 12 13:46:40 1970 +0000 | |
| 944 | Sun Jan 18 08:40:01 1970 +0000 |
|
944 | Sun Jan 18 08:40:01 1970 +0000 | |
| 945 | Sun Jan 18 08:40:00 1970 +0000 |
|
945 | Sun Jan 18 08:40:00 1970 +0000 | |
| 946 | Sat Jan 17 04:53:20 1970 +0000 |
|
946 | Sat Jan 17 04:53:20 1970 +0000 | |
| 947 | Fri Jan 16 01:06:40 1970 +0000 |
|
947 | Fri Jan 16 01:06:40 1970 +0000 | |
| 948 | Wed Jan 14 21:20:00 1970 +0000 |
|
948 | Wed Jan 14 21:20:00 1970 +0000 | |
| 949 | Tue Jan 13 17:33:20 1970 +0000 |
|
949 | Tue Jan 13 17:33:20 1970 +0000 | |
| 950 | Mon Jan 12 13:46:40 1970 +0000 |
|
950 | Mon Jan 12 13:46:40 1970 +0000 | |
| 951 | 2020-01-01 10:01 +0000 |
|
951 | 2020-01-01 10:01 +0000 | |
| 952 | 1970-01-12 13:46 +0000 |
|
952 | 1970-01-12 13:46 +0000 | |
| 953 | 1970-01-18 08:40 +0000 |
|
953 | 1970-01-18 08:40 +0000 | |
| 954 | 1970-01-18 08:40 +0000 |
|
954 | 1970-01-18 08:40 +0000 | |
| 955 | 1970-01-17 04:53 +0000 |
|
955 | 1970-01-17 04:53 +0000 | |
| 956 | 1970-01-16 01:06 +0000 |
|
956 | 1970-01-16 01:06 +0000 | |
| 957 | 1970-01-14 21:20 +0000 |
|
957 | 1970-01-14 21:20 +0000 | |
| 958 | 1970-01-13 17:33 +0000 |
|
958 | 1970-01-13 17:33 +0000 | |
| 959 | 1970-01-12 13:46 +0000 |
|
959 | 1970-01-12 13:46 +0000 | |
| 960 | 2020-01-01 10:01:00 +0000 |
|
960 | 2020-01-01 10:01:00 +0000 | |
| 961 | 1970-01-12 13:46:40 +0000 |
|
961 | 1970-01-12 13:46:40 +0000 | |
| 962 | 1970-01-18 08:40:01 +0000 |
|
962 | 1970-01-18 08:40:01 +0000 | |
| 963 | 1970-01-18 08:40:00 +0000 |
|
963 | 1970-01-18 08:40:00 +0000 | |
| 964 | 1970-01-17 04:53:20 +0000 |
|
964 | 1970-01-17 04:53:20 +0000 | |
| 965 | 1970-01-16 01:06:40 +0000 |
|
965 | 1970-01-16 01:06:40 +0000 | |
| 966 | 1970-01-14 21:20:00 +0000 |
|
966 | 1970-01-14 21:20:00 +0000 | |
| 967 | 1970-01-13 17:33:20 +0000 |
|
967 | 1970-01-13 17:33:20 +0000 | |
| 968 | 1970-01-12 13:46:40 +0000 |
|
968 | 1970-01-12 13:46:40 +0000 | |
| 969 | Wed, 01 Jan 2020 10:01:00 +0000 |
|
969 | Wed, 01 Jan 2020 10:01:00 +0000 | |
| 970 | Mon, 12 Jan 1970 13:46:40 +0000 |
|
970 | Mon, 12 Jan 1970 13:46:40 +0000 | |
| 971 | Sun, 18 Jan 1970 08:40:01 +0000 |
|
971 | Sun, 18 Jan 1970 08:40:01 +0000 | |
| 972 | Sun, 18 Jan 1970 08:40:00 +0000 |
|
972 | Sun, 18 Jan 1970 08:40:00 +0000 | |
| 973 | Sat, 17 Jan 1970 04:53:20 +0000 |
|
973 | Sat, 17 Jan 1970 04:53:20 +0000 | |
| 974 | Fri, 16 Jan 1970 01:06:40 +0000 |
|
974 | Fri, 16 Jan 1970 01:06:40 +0000 | |
| 975 | Wed, 14 Jan 1970 21:20:00 +0000 |
|
975 | Wed, 14 Jan 1970 21:20:00 +0000 | |
| 976 | Tue, 13 Jan 1970 17:33:20 +0000 |
|
976 | Tue, 13 Jan 1970 17:33:20 +0000 | |
| 977 | Mon, 12 Jan 1970 13:46:40 +0000 |
|
977 | Mon, 12 Jan 1970 13:46:40 +0000 | |
| 978 | third |
|
978 | third | |
| 979 | second |
|
979 | second | |
| 980 | merge |
|
980 | merge | |
| 981 | new head |
|
981 | new head | |
| 982 | new branch |
|
982 | new branch | |
| 983 | no user, no domain |
|
983 | no user, no domain | |
| 984 | no person |
|
984 | no person | |
| 985 | other 1 |
|
985 | other 1 | |
| 986 | line 1 |
|
986 | line 1 | |
| 987 | 3bdecc1cde0c |
|
987 | 95c24699272e | |
| 988 | 29114dbae42b |
|
988 | 29114dbae42b | |
| 989 | c7b487c6c50e |
|
989 | c7b487c6c50e | |
| 990 | 13207e5a10d9 |
|
990 | 13207e5a10d9 | |
| 991 | 32a18f097fcc |
|
991 | 32a18f097fcc | |
| 992 | 10e46f2dcbf4 |
|
992 | 10e46f2dcbf4 | |
| 993 | 97054abb4ab8 |
|
993 | 97054abb4ab8 | |
| 994 | b608e9d1a3f0 |
|
994 | b608e9d1a3f0 | |
| 995 | 1e4e1b8f71e0 |
|
995 | 1e4e1b8f71e0 | |
| 996 | <changeset author="test"/> |
|
996 | <changeset author="test"/> | |
| 997 | <changeset author="User Name <user@hostname>"/> |
|
997 | <changeset author="User Name <user@hostname>"/> | |
| 998 | <changeset author="person"/> |
|
998 | <changeset author="person"/> | |
| 999 | <changeset author="person"/> |
|
999 | <changeset author="person"/> | |
| 1000 | <changeset author="person"/> |
|
1000 | <changeset author="person"/> | |
| 1001 | <changeset author="person"/> |
|
1001 | <changeset author="person"/> | |
| 1002 | <changeset author="other@place"/> |
|
1002 | <changeset author="other@place"/> | |
| 1003 | <changeset author="A. N. Other <other@place>"/> |
|
1003 | <changeset author="A. N. Other <other@place>"/> | |
| 1004 | <changeset author="User Name <user@hostname>"/> |
|
1004 | <changeset author="User Name <user@hostname>"/> | |
| 1005 | # formatnode filter works |
|
1005 | # formatnode filter works | |
| 1006 | # quiet |
|
1006 | # quiet | |
| 1007 | 1e4e1b8f71e0 |
|
1007 | 1e4e1b8f71e0 | |
| 1008 | # normal |
|
1008 | # normal | |
| 1009 | 1e4e1b8f71e0 |
|
1009 | 1e4e1b8f71e0 | |
| 1010 | # verbose |
|
1010 | # verbose | |
| 1011 | 1e4e1b8f71e0 |
|
1011 | 1e4e1b8f71e0 | |
| 1012 | # debug |
|
1012 | # debug | |
| 1013 | 1e4e1b8f71e05681d422154f5421e385fec3454f |
|
1013 | 1e4e1b8f71e05681d422154f5421e385fec3454f | |
| 1014 | # error on syntax |
|
1014 | # error on syntax | |
| 1015 | abort: t:3: unmatched quotes |
|
1015 | abort: t:3: unmatched quotes | |
| 1016 | # latesttag |
|
1016 | # latesttag | |
| 1017 | adding file |
|
1017 | adding file | |
| 1018 | adding head1 |
|
1018 | adding head1 | |
| 1019 | adding head2 |
|
1019 | adding head2 | |
| 1020 | created new head |
|
1020 | created new head | |
| 1021 | # No tag set |
|
1021 | # No tag set | |
| 1022 | 5: null+5 |
|
1022 | 5: null+5 | |
| 1023 | 4: null+4 |
|
1023 | 4: null+4 | |
| 1024 | 3: null+3 |
|
1024 | 3: null+3 | |
| 1025 | 2: null+3 |
|
1025 | 2: null+3 | |
| 1026 | 1: null+2 |
|
1026 | 1: null+2 | |
| 1027 | 0: null+1 |
|
1027 | 0: null+1 | |
| 1028 | # one common tag: longuest path wins |
|
1028 | # one common tag: longuest path wins | |
| 1029 | 6: t1+4 |
|
1029 | 6: t1+4 | |
| 1030 | 5: t1+3 |
|
1030 | 5: t1+3 | |
| 1031 | 4: t1+2 |
|
1031 | 4: t1+2 | |
| 1032 | 3: t1+1 |
|
1032 | 3: t1+1 | |
| 1033 | 2: t1+1 |
|
1033 | 2: t1+1 | |
| 1034 | 1: t1+0 |
|
1034 | 1: t1+0 | |
| 1035 | 0: null+1 |
|
1035 | 0: null+1 | |
| 1036 | # one ancestor tag: more recent wins |
|
1036 | # one ancestor tag: more recent wins | |
| 1037 | 7: t2+3 |
|
1037 | 7: t2+3 | |
| 1038 | 6: t2+2 |
|
1038 | 6: t2+2 | |
| 1039 | 5: t2+1 |
|
1039 | 5: t2+1 | |
| 1040 | 4: t1+2 |
|
1040 | 4: t1+2 | |
| 1041 | 3: t1+1 |
|
1041 | 3: t1+1 | |
| 1042 | 2: t2+0 |
|
1042 | 2: t2+0 | |
| 1043 | 1: t1+0 |
|
1043 | 1: t1+0 | |
| 1044 | 0: null+1 |
|
1044 | 0: null+1 | |
| 1045 | # two branch tags: more recent wins |
|
1045 | # two branch tags: more recent wins | |
| 1046 | 8: t3+5 |
|
1046 | 8: t3+5 | |
| 1047 | 7: t3+4 |
|
1047 | 7: t3+4 | |
| 1048 | 6: t3+3 |
|
1048 | 6: t3+3 | |
| 1049 | 5: t3+2 |
|
1049 | 5: t3+2 | |
| 1050 | 4: t3+1 |
|
1050 | 4: t3+1 | |
| 1051 | 3: t3+0 |
|
1051 | 3: t3+0 | |
| 1052 | 2: t2+0 |
|
1052 | 2: t2+0 | |
| 1053 | 1: t1+0 |
|
1053 | 1: t1+0 | |
| 1054 | 0: null+1 |
|
1054 | 0: null+1 | |
| 1055 | # merged tag overrides |
|
1055 | # merged tag overrides | |
| 1056 | 10: t5+5 |
|
1056 | 10: t5+5 | |
| 1057 | 9: t5+4 |
|
1057 | 9: t5+4 | |
| 1058 | 8: t5+3 |
|
1058 | 8: t5+3 | |
| 1059 | 7: t5+2 |
|
1059 | 7: t5+2 | |
| 1060 | 6: t5+1 |
|
1060 | 6: t5+1 | |
| 1061 | 5: t5+0 |
|
1061 | 5: t5+0 | |
| 1062 | 4: at3:t3+1 |
|
1062 | 4: at3:t3+1 | |
| 1063 | 3: at3:t3+0 |
|
1063 | 3: at3:t3+0 | |
| 1064 | 2: t2+0 |
|
1064 | 2: t2+0 | |
| 1065 | 1: t1+0 |
|
1065 | 1: t1+0 | |
| 1066 | 0: null+1 |
|
1066 | 0: null+1 | |
| 1067 | # style path expansion (issue1948) |
|
1067 | # style path expansion (issue1948) | |
| 1068 | test 10:dee8f28249af |
|
1068 | test 10:dee8f28249af | |
| 1069 | # test recursive showlist template (issue1989) |
|
1069 | # test recursive showlist template (issue1989) | |
| 1070 | M|test |
|
1070 | M|test | |
| 1071 | 10,test |
|
1071 | 10,test | |
| 1072 | branch: test |
|
1072 | branch: test | |
| 1073 | # done |
|
1073 | # done | |
| @@ -1,37 +1,37 b'' | |||||
| 1 | % initialize darcs repo |
|
1 | % initialize darcs repo | |
| 2 | Finished recording patch 'p0' |
|
2 | Finished recording patch 'p0' | |
| 3 | % branch and update |
|
3 | % branch and update | |
| 4 | Finished recording patch 'p1.1' |
|
4 | Finished recording patch 'p1.1' | |
| 5 | % update source |
|
5 | % update source | |
| 6 | Finished recording patch 'p1.2' |
|
6 | Finished recording patch 'p1.2' | |
| 7 | % merge branch |
|
7 | % merge branch | |
| 8 | Backing up ./a(-darcs-backup0) |
|
8 | Backing up ./a(-darcs-backup0) | |
| 9 | We have conflicts in the following files: |
|
9 | We have conflicts in the following files: | |
| 10 | ./a |
|
10 | ./a | |
| 11 | Finished pulling and applying. |
|
11 | Finished pulling and applying. | |
| 12 | Finished recording patch 'p2' |
|
12 | Finished recording patch 'p2' | |
| 13 | % test file and directory move |
|
13 | % test file and directory move | |
| 14 | Finished recording patch 'p3' |
|
14 | Finished recording patch 'p3' | |
| 15 | initializing destination darcs-repo-hg repository |
|
15 | initializing destination darcs-repo-hg repository | |
| 16 | scanning source... |
|
16 | scanning source... | |
| 17 | sorting... |
|
17 | sorting... | |
| 18 | converting... |
|
18 | converting... | |
| 19 | 4 p0 |
|
19 | 4 p0 | |
| 20 | 3 p1.2 |
|
20 | 3 p1.2 | |
| 21 | 2 p1.1 |
|
21 | 2 p1.1 | |
| 22 | 1 p2 |
|
22 | 1 p2 | |
| 23 | 0 p3 |
|
23 | 0 p3 | |
| 24 | o 4 "p3" files: dir/d dir/d2 dir2/d f ff |
|
24 | o 4 "p3" files: dir/d dir/d2 dir2/d f ff | |
| 25 | | |
|
25 | | | |
| 26 | o 3 "p2" files: a dir/d dir/d2 f |
|
26 | o 3 "p2" files: a dir/d dir/d2 f | |
| 27 | | |
|
27 | | | |
| 28 | o 2 "p1.1" files: |
|
28 | o 2 "p1.1" files: | |
| 29 | | |
|
29 | | | |
| 30 | o 1 "p1.2" files: a b |
|
30 | o 1 "p1.2" files: a b | |
| 31 | | |
|
31 | | | |
| 32 | o 0 "p0" files: a |
|
32 | o 0 "p0" files: a | |
| 33 |
|
33 | |||
| 34 | 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a |
|
34 | 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a | |
| 35 | 1e88685f5ddec574a34c70af492f95b6debc8741 644 b |
|
35 | 1e88685f5ddec574a34c70af492f95b6debc8741 644 b | |
| 36 | d278f41640da5fc303a4cf9894af31c2983fc11d 644 dir2/d |
|
36 | 37406831adc447ec2385014019599dfec953c806 644 dir2/d | |
| 37 | ef5c76581d78340f568d5f48d679bf307452cbc9 644 ff |
|
37 | b783a337463792a5c7d548ad85a7d3253c16ba8c 644 ff | |
| @@ -1,159 +1,159 b'' | |||||
| 1 | created new head |
|
1 | created new head | |
| 2 | created new head |
|
2 | created new head | |
| 3 | @ 8 "8: change foo" files: foo |
|
3 | @ 8 "8: change foo" files: foo | |
| 4 | | |
|
4 | | | |
| 5 | o 7 "7: second merge; change bar" files: bar baz |
|
5 | o 7 "7: second merge; change bar" files: bar baz | |
| 6 | |\ |
|
6 | |\ | |
| 7 | | o 6 "6: change foo baz" files: baz foo |
|
7 | | o 6 "6: change foo baz" files: baz foo | |
| 8 | | | |
|
8 | | | | |
| 9 | o | 5 "5: change bar baz quux" files: bar baz quux |
|
9 | o | 5 "5: change bar baz quux" files: bar baz quux | |
| 10 | |/ |
|
10 | |/ | |
| 11 | o 4 "4: first merge; change bar baz" files: bar baz |
|
11 | o 4 "4: first merge; change bar baz" files: bar baz | |
| 12 | |\ |
|
12 | |\ | |
| 13 | | o 3 "3: change bar quux" files: bar quux |
|
13 | | o 3 "3: change bar quux" files: bar quux | |
| 14 | | | |
|
14 | | | | |
| 15 | o | 2 "2: change foo" files: foo |
|
15 | o | 2 "2: change foo" files: foo | |
| 16 | |/ |
|
16 | |/ | |
| 17 | o 1 "1: add bar quux; copy foo to copied" files: bar copied quux |
|
17 | o 1 "1: add bar quux; copy foo to copied" files: bar copied quux | |
| 18 | | |
|
18 | | | |
| 19 | o 0 "0: add foo baz dir/" files: baz dir/file dir/file2 dir/subdir/file3 dir/subdir/file4 foo |
|
19 | o 0 "0: add foo baz dir/" files: baz dir/file dir/file2 dir/subdir/file3 dir/subdir/file4 foo | |
| 20 |
|
20 | |||
| 21 | % final file versions in this repo: |
|
21 | % final file versions in this repo: | |
| 22 | 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
|
22 | 9463f52fe115e377cf2878d4fc548117211063f2 644 bar | |
| 23 | 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
|
23 | 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz | |
| 24 | 6ca237634e1f6bee1b6db94292fb44f092a25842 644 copied |
|
24 | 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied | |
| 25 | 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file |
|
25 | 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file | |
| 26 | 75e6d3f8328f5f6ace6bf10b98df793416a09dca 644 dir/file2 |
|
26 | 75e6d3f8328f5f6ace6bf10b98df793416a09dca 644 dir/file2 | |
| 27 | 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir/subdir/file3 |
|
27 | 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir/subdir/file3 | |
| 28 | 57a1c1511590f3de52874adfa04effe8a77d64af 644 dir/subdir/file4 |
|
28 | 57a1c1511590f3de52874adfa04effe8a77d64af 644 dir/subdir/file4 | |
| 29 | 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
|
29 | 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo | |
| 30 | bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
|
30 | bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux | |
| 31 | copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
|
31 | copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd | |
| 32 |
|
32 | |||
| 33 | % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd |
|
33 | % foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd | |
| 34 | @ 3 "8: change foo" files: foo |
|
34 | @ 3 "8: change foo" files: foo | |
| 35 | | |
|
35 | | | |
| 36 | o 2 "6: change foo baz" files: foo |
|
36 | o 2 "6: change foo baz" files: foo | |
| 37 | | |
|
37 | | | |
| 38 | o 1 "2: change foo" files: foo |
|
38 | o 1 "2: change foo" files: foo | |
| 39 | | |
|
39 | | | |
| 40 | o 0 "0: add foo baz dir/" files: foo |
|
40 | o 0 "0: add foo baz dir/" files: foo | |
| 41 |
|
41 | |||
| 42 | 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
|
42 | 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo | |
| 43 | % bar: merges are not merges anymore |
|
43 | % bar: merges are not merges anymore | |
| 44 | @ 4 "7: second merge; change bar" files: bar |
|
44 | @ 4 "7: second merge; change bar" files: bar | |
| 45 | | |
|
45 | | | |
| 46 | o 3 "5: change bar baz quux" files: bar |
|
46 | o 3 "5: change bar baz quux" files: bar | |
| 47 | | |
|
47 | | | |
| 48 | o 2 "4: first merge; change bar baz" files: bar |
|
48 | o 2 "4: first merge; change bar baz" files: bar | |
| 49 | | |
|
49 | | | |
| 50 | o 1 "3: change bar quux" files: bar |
|
50 | o 1 "3: change bar quux" files: bar | |
| 51 | | |
|
51 | | | |
| 52 | o 0 "1: add bar quux; copy foo to copied" files: bar |
|
52 | o 0 "1: add bar quux; copy foo to copied" files: bar | |
| 53 |
|
53 | |||
| 54 | 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
|
54 | 9463f52fe115e377cf2878d4fc548117211063f2 644 bar | |
| 55 | % baz: 1st merge is not a merge anymore; 2nd still is |
|
55 | % baz: 1st merge is not a merge anymore; 2nd still is | |
| 56 | @ 4 "7: second merge; change bar" files: baz |
|
56 | @ 4 "7: second merge; change bar" files: baz | |
| 57 | |\ |
|
57 | |\ | |
| 58 | | o 3 "6: change foo baz" files: baz |
|
58 | | o 3 "6: change foo baz" files: baz | |
| 59 | | | |
|
59 | | | | |
| 60 | o | 2 "5: change bar baz quux" files: baz |
|
60 | o | 2 "5: change bar baz quux" files: baz | |
| 61 | |/ |
|
61 | |/ | |
| 62 | o 1 "4: first merge; change bar baz" files: baz |
|
62 | o 1 "4: first merge; change bar baz" files: baz | |
| 63 | | |
|
63 | | | |
| 64 | o 0 "0: add foo baz dir/" files: baz |
|
64 | o 0 "0: add foo baz dir/" files: baz | |
| 65 |
|
65 | |||
| 66 | 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz |
|
66 | 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz | |
| 67 | % foo quux: we add additional merges when they are interesting |
|
67 | % foo quux: we add additional merges when they are interesting | |
| 68 | @ 8 "8: change foo" files: foo |
|
68 | @ 8 "8: change foo" files: foo | |
| 69 | | |
|
69 | | | |
| 70 | o 7 "7: second merge; change bar" files: |
|
70 | o 7 "7: second merge; change bar" files: | |
| 71 | |\ |
|
71 | |\ | |
| 72 | | o 6 "6: change foo baz" files: foo |
|
72 | | o 6 "6: change foo baz" files: foo | |
| 73 | | | |
|
73 | | | | |
| 74 | o | 5 "5: change bar baz quux" files: quux |
|
74 | o | 5 "5: change bar baz quux" files: quux | |
| 75 | |/ |
|
75 | |/ | |
| 76 | o 4 "4: first merge; change bar baz" files: |
|
76 | o 4 "4: first merge; change bar baz" files: | |
| 77 | |\ |
|
77 | |\ | |
| 78 | | o 3 "3: change bar quux" files: quux |
|
78 | | o 3 "3: change bar quux" files: quux | |
| 79 | | | |
|
79 | | | | |
| 80 | o | 2 "2: change foo" files: foo |
|
80 | o | 2 "2: change foo" files: foo | |
| 81 | |/ |
|
81 | |/ | |
| 82 | o 1 "1: add bar quux; copy foo to copied" files: quux |
|
82 | o 1 "1: add bar quux; copy foo to copied" files: quux | |
| 83 | | |
|
83 | | | |
| 84 | o 0 "0: add foo baz dir/" files: foo |
|
84 | o 0 "0: add foo baz dir/" files: foo | |
| 85 |
|
85 | |||
| 86 | 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
|
86 | 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo | |
| 87 | bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
|
87 | bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux | |
| 88 | % bar quux: partial conversion |
|
88 | % bar quux: partial conversion | |
| 89 | @ 1 "3: change bar quux" files: bar quux |
|
89 | @ 1 "3: change bar quux" files: bar quux | |
| 90 | | |
|
90 | | | |
| 91 | o 0 "1: add bar quux; copy foo to copied" files: bar quux |
|
91 | o 0 "1: add bar quux; copy foo to copied" files: bar quux | |
| 92 |
|
92 | |||
| 93 | b79105bedc55102f394e90a789c9c380117c1b4a 644 bar |
|
93 | b79105bedc55102f394e90a789c9c380117c1b4a 644 bar | |
| 94 | db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux |
|
94 | db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux | |
| 95 | % bar quux: complete the partial conversion |
|
95 | % bar quux: complete the partial conversion | |
| 96 | @ 4 "7: second merge; change bar" files: bar |
|
96 | @ 4 "7: second merge; change bar" files: bar | |
| 97 | | |
|
97 | | | |
| 98 | o 3 "5: change bar baz quux" files: bar quux |
|
98 | o 3 "5: change bar baz quux" files: bar quux | |
| 99 | | |
|
99 | | | |
| 100 | o 2 "4: first merge; change bar baz" files: bar |
|
100 | o 2 "4: first merge; change bar baz" files: bar | |
| 101 | | |
|
101 | | | |
| 102 | o 1 "3: change bar quux" files: bar quux |
|
102 | o 1 "3: change bar quux" files: bar quux | |
| 103 | | |
|
103 | | | |
| 104 | o 0 "1: add bar quux; copy foo to copied" files: bar quux |
|
104 | o 0 "1: add bar quux; copy foo to copied" files: bar quux | |
| 105 |
|
105 | |||
| 106 | 9463f52fe115e377cf2878d4fc548117211063f2 644 bar |
|
106 | 9463f52fe115e377cf2878d4fc548117211063f2 644 bar | |
| 107 | bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux |
|
107 | bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux | |
| 108 | % foo: partial conversion |
|
108 | % foo: partial conversion | |
| 109 | @ 0 "0: add foo baz dir/" files: foo |
|
109 | @ 0 "0: add foo baz dir/" files: foo | |
| 110 |
|
110 | |||
| 111 | 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
|
111 | 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo | |
| 112 | % foo: complete the partial conversion |
|
112 | % foo: complete the partial conversion | |
| 113 | @ 3 "8: change foo" files: foo |
|
113 | @ 3 "8: change foo" files: foo | |
| 114 | | |
|
114 | | | |
| 115 | o 2 "6: change foo baz" files: foo |
|
115 | o 2 "6: change foo baz" files: foo | |
| 116 | | |
|
116 | | | |
| 117 | o 1 "2: change foo" files: foo |
|
117 | o 1 "2: change foo" files: foo | |
| 118 | | |
|
118 | | | |
| 119 | o 0 "0: add foo baz dir/" files: foo |
|
119 | o 0 "0: add foo baz dir/" files: foo | |
| 120 |
|
120 | |||
| 121 | 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
|
121 | 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo | |
| 122 | % copied: copied file; source not included in new repo |
|
122 | % copied: copied file; source not included in new repo | |
| 123 | @ 0 "1: add bar quux; copy foo to copied" files: copied |
|
123 | @ 0 "1: add bar quux; copy foo to copied" files: copied | |
| 124 |
|
124 | |||
| 125 | 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied |
|
125 | 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied | |
| 126 | copied not renamed |
|
126 | copied not renamed | |
| 127 | % foo copied: copied file; source included in new repo |
|
127 | % foo copied: copied file; source included in new repo | |
| 128 | @ 4 "8: change foo" files: foo |
|
128 | @ 4 "8: change foo" files: foo | |
| 129 | | |
|
129 | | | |
| 130 | o 3 "6: change foo baz" files: foo |
|
130 | o 3 "6: change foo baz" files: foo | |
| 131 | | |
|
131 | | | |
| 132 | o 2 "2: change foo" files: foo |
|
132 | o 2 "2: change foo" files: foo | |
| 133 | | |
|
133 | | | |
| 134 | o 1 "1: add bar quux; copy foo to copied" files: copied |
|
134 | o 1 "1: add bar quux; copy foo to copied" files: copied | |
| 135 | | |
|
135 | | | |
| 136 | o 0 "0: add foo baz dir/" files: foo |
|
136 | o 0 "0: add foo baz dir/" files: foo | |
| 137 |
|
137 | |||
| 138 | 6ca237634e1f6bee1b6db94292fb44f092a25842 644 copied |
|
138 | 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied | |
| 139 | 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo |
|
139 | 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo | |
| 140 | copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
|
140 | copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd | |
| 141 | @ 4 "8: change foo" files: foo2 |
|
141 | @ 4 "8: change foo" files: foo2 | |
| 142 | | |
|
142 | | | |
| 143 | o 3 "6: change foo baz" files: foo2 |
|
143 | o 3 "6: change foo baz" files: foo2 | |
| 144 | | |
|
144 | | | |
| 145 | o 2 "2: change foo" files: foo2 |
|
145 | o 2 "2: change foo" files: foo2 | |
| 146 | | |
|
146 | | | |
| 147 | o 1 "1: add bar quux; copy foo to copied" files: copied2 |
|
147 | o 1 "1: add bar quux; copy foo to copied" files: copied2 | |
| 148 | | |
|
148 | | | |
| 149 | o 0 "0: add foo baz dir/" files: dir2/file dir2/subdir/file3 foo2 |
|
149 | o 0 "0: add foo baz dir/" files: dir2/file dir2/subdir/file3 foo2 | |
| 150 |
|
150 | |||
| 151 | e5e3d520be9be45937d0b06b004fadcd6c221fa2 644 copied2 |
|
151 | d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2 | |
| 152 | 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file |
|
152 | 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file | |
| 153 | 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir2/subdir/file3 |
|
153 | 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir2/subdir/file3 | |
| 154 | 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2 |
|
154 | 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2 | |
| 155 | copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
|
155 | copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd | |
| 156 | copied: |
|
156 | copied: | |
| 157 | foo |
|
157 | foo | |
| 158 | copied2: |
|
158 | copied2: | |
| 159 | foo |
|
159 | foo | |
| @@ -1,5 +1,5 b'' | |||||
| 1 | % convert while testing all possible outputs |
|
1 | % convert while testing all possible outputs | |
| 2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 3 | % check tags are in UTF-8 |
|
3 | % check tags are in UTF-8 | |
| 4 | '1c1b4062874e8197a68e7ce9e498479a37d0215c branch\xc3\xa9e\n' |
|
4 | '221c3fdaf24df5f14c0a64c597581e2eacfb47bb branch\xc3\xa9e\n' | |
| 5 | 'edc96568720ef79eefa6372677b18d855de3abee branch\xc3\xa9\n' |
|
5 | '7a40952c2db29cf00d9e31df3749e98d8a4bdcbf branch\xc3\xa9\n' | |
| @@ -1,337 +1,337 b'' | |||||
| 1 | % add |
|
1 | % add | |
| 2 | adding a |
|
2 | adding a | |
| 3 | adding d1/d2/b |
|
3 | adding d1/d2/b | |
| 4 | % modify |
|
4 | % modify | |
| 5 | 1:e0e2b8a9156b |
|
5 | 1:e0e2b8a9156b | |
| 6 | assuming destination a-hg |
|
6 | assuming destination a-hg | |
| 7 | initializing svn repo 'a-hg' |
|
7 | initializing svn repo 'a-hg' | |
| 8 | initializing svn wc 'a-hg-wc' |
|
8 | initializing svn wc 'a-hg-wc' | |
| 9 | scanning source... |
|
9 | scanning source... | |
| 10 | sorting... |
|
10 | sorting... | |
| 11 | converting... |
|
11 | converting... | |
| 12 | 1 add a file |
|
12 | 1 add a file | |
| 13 | 0 modify a file |
|
13 | 0 modify a file | |
| 14 | At revision 2. |
|
14 | At revision 2. | |
| 15 | 2 2 test . |
|
15 | 2 2 test . | |
| 16 | 2 2 test a |
|
16 | 2 2 test a | |
| 17 | 2 1 test d1 |
|
17 | 2 1 test d1 | |
| 18 | 2 1 test d1/d2 |
|
18 | 2 1 test d1/d2 | |
| 19 | 2 1 test d1/d2/b |
|
19 | 2 1 test d1/d2/b | |
| 20 | <?xml version="1.0"?> |
|
20 | <?xml version="1.0"?> | |
| 21 | <log> |
|
21 | <log> | |
| 22 | <logentry |
|
22 | <logentry | |
| 23 | revision="2"> |
|
23 | revision="2"> | |
| 24 | <author>test</author> |
|
24 | <author>test</author> | |
| 25 | <date/> |
|
25 | <date/> | |
| 26 | <paths> |
|
26 | <paths> | |
| 27 | <path |
|
27 | <path | |
| 28 | action="M">/a</path> |
|
28 | action="M">/a</path> | |
| 29 | </paths> |
|
29 | </paths> | |
| 30 | <msg>modify a file</msg> |
|
30 | <msg>modify a file</msg> | |
| 31 | </logentry> |
|
31 | </logentry> | |
| 32 | <logentry |
|
32 | <logentry | |
| 33 | revision="1"> |
|
33 | revision="1"> | |
| 34 | <author>test</author> |
|
34 | <author>test</author> | |
| 35 | <date/> |
|
35 | <date/> | |
| 36 | <paths> |
|
36 | <paths> | |
| 37 | <path |
|
37 | <path | |
| 38 | action="A">/a</path> |
|
38 | action="A">/a</path> | |
| 39 | <path |
|
39 | <path | |
| 40 | action="A">/d1</path> |
|
40 | action="A">/d1</path> | |
| 41 | <path |
|
41 | <path | |
| 42 | action="A">/d1/d2</path> |
|
42 | action="A">/d1/d2</path> | |
| 43 | <path |
|
43 | <path | |
| 44 | action="A">/d1/d2/b</path> |
|
44 | action="A">/d1/d2/b</path> | |
| 45 | </paths> |
|
45 | </paths> | |
| 46 | <msg>add a file</msg> |
|
46 | <msg>add a file</msg> | |
| 47 | </logentry> |
|
47 | </logentry> | |
| 48 | </log> |
|
48 | </log> | |
| 49 | a: |
|
49 | a: | |
| 50 | a |
|
50 | a | |
| 51 | d1 |
|
51 | d1 | |
| 52 |
|
52 | |||
| 53 | a-hg-wc: |
|
53 | a-hg-wc: | |
| 54 | a |
|
54 | a | |
| 55 | d1 |
|
55 | d1 | |
| 56 | same |
|
56 | same | |
| 57 | % rename |
|
57 | % rename | |
| 58 | 2:7009fc4efb34 |
|
58 | 2:eb5169441d43 | |
| 59 | assuming destination a-hg |
|
59 | assuming destination a-hg | |
| 60 | initializing svn wc 'a-hg-wc' |
|
60 | initializing svn wc 'a-hg-wc' | |
| 61 | scanning source... |
|
61 | scanning source... | |
| 62 | sorting... |
|
62 | sorting... | |
| 63 | converting... |
|
63 | converting... | |
| 64 | 0 rename a file |
|
64 | 0 rename a file | |
| 65 | At revision 3. |
|
65 | At revision 3. | |
| 66 | 3 3 test . |
|
66 | 3 3 test . | |
| 67 | 3 3 test b |
|
67 | 3 3 test b | |
| 68 | 3 1 test d1 |
|
68 | 3 1 test d1 | |
| 69 | 3 1 test d1/d2 |
|
69 | 3 1 test d1/d2 | |
| 70 | 3 1 test d1/d2/b |
|
70 | 3 1 test d1/d2/b | |
| 71 | <?xml version="1.0"?> |
|
71 | <?xml version="1.0"?> | |
| 72 | <log> |
|
72 | <log> | |
| 73 | <logentry |
|
73 | <logentry | |
| 74 | revision="3"> |
|
74 | revision="3"> | |
| 75 | <author>test</author> |
|
75 | <author>test</author> | |
| 76 | <date/> |
|
76 | <date/> | |
| 77 | <paths> |
|
77 | <paths> | |
| 78 | <path |
|
78 | <path | |
| 79 | action="D">/a</path> |
|
79 | action="D">/a</path> | |
| 80 | <path |
|
80 | <path | |
| 81 | copyfrom-path="/a" |
|
81 | copyfrom-path="/a" | |
| 82 | copyfrom-rev="2" |
|
82 | copyfrom-rev="2" | |
| 83 | action="A">/b</path> |
|
83 | action="A">/b</path> | |
| 84 | </paths> |
|
84 | </paths> | |
| 85 | <msg>rename a file</msg> |
|
85 | <msg>rename a file</msg> | |
| 86 | </logentry> |
|
86 | </logentry> | |
| 87 | </log> |
|
87 | </log> | |
| 88 | a: |
|
88 | a: | |
| 89 | b |
|
89 | b | |
| 90 | d1 |
|
90 | d1 | |
| 91 |
|
91 | |||
| 92 | a-hg-wc: |
|
92 | a-hg-wc: | |
| 93 | b |
|
93 | b | |
| 94 | d1 |
|
94 | d1 | |
| 95 | % copy |
|
95 | % copy | |
| 96 | 3:56c519973ce6 |
|
96 | 3:60effef6ab48 | |
| 97 | assuming destination a-hg |
|
97 | assuming destination a-hg | |
| 98 | initializing svn wc 'a-hg-wc' |
|
98 | initializing svn wc 'a-hg-wc' | |
| 99 | scanning source... |
|
99 | scanning source... | |
| 100 | sorting... |
|
100 | sorting... | |
| 101 | converting... |
|
101 | converting... | |
| 102 | 0 copy a file |
|
102 | 0 copy a file | |
| 103 | At revision 4. |
|
103 | At revision 4. | |
| 104 | 4 4 test . |
|
104 | 4 4 test . | |
| 105 | 4 3 test b |
|
105 | 4 3 test b | |
| 106 | 4 4 test c |
|
106 | 4 4 test c | |
| 107 | 4 1 test d1 |
|
107 | 4 1 test d1 | |
| 108 | 4 1 test d1/d2 |
|
108 | 4 1 test d1/d2 | |
| 109 | 4 1 test d1/d2/b |
|
109 | 4 1 test d1/d2/b | |
| 110 | <?xml version="1.0"?> |
|
110 | <?xml version="1.0"?> | |
| 111 | <log> |
|
111 | <log> | |
| 112 | <logentry |
|
112 | <logentry | |
| 113 | revision="4"> |
|
113 | revision="4"> | |
| 114 | <author>test</author> |
|
114 | <author>test</author> | |
| 115 | <date/> |
|
115 | <date/> | |
| 116 | <paths> |
|
116 | <paths> | |
| 117 | <path |
|
117 | <path | |
| 118 | copyfrom-path="/b" |
|
118 | copyfrom-path="/b" | |
| 119 | copyfrom-rev="3" |
|
119 | copyfrom-rev="3" | |
| 120 | action="A">/c</path> |
|
120 | action="A">/c</path> | |
| 121 | </paths> |
|
121 | </paths> | |
| 122 | <msg>copy a file</msg> |
|
122 | <msg>copy a file</msg> | |
| 123 | </logentry> |
|
123 | </logentry> | |
| 124 | </log> |
|
124 | </log> | |
| 125 | a: |
|
125 | a: | |
| 126 | b |
|
126 | b | |
| 127 | c |
|
127 | c | |
| 128 | d1 |
|
128 | d1 | |
| 129 |
|
129 | |||
| 130 | a-hg-wc: |
|
130 | a-hg-wc: | |
| 131 | b |
|
131 | b | |
| 132 | c |
|
132 | c | |
| 133 | d1 |
|
133 | d1 | |
| 134 | % remove |
|
134 | % remove | |
| 135 | 4:ed4dc9a6f585 |
|
135 | 4:87bbe3013fb6 | |
| 136 | assuming destination a-hg |
|
136 | assuming destination a-hg | |
| 137 | initializing svn wc 'a-hg-wc' |
|
137 | initializing svn wc 'a-hg-wc' | |
| 138 | scanning source... |
|
138 | scanning source... | |
| 139 | sorting... |
|
139 | sorting... | |
| 140 | converting... |
|
140 | converting... | |
| 141 | 0 remove a file |
|
141 | 0 remove a file | |
| 142 | At revision 5. |
|
142 | At revision 5. | |
| 143 | 5 5 test . |
|
143 | 5 5 test . | |
| 144 | 5 4 test c |
|
144 | 5 4 test c | |
| 145 | 5 1 test d1 |
|
145 | 5 1 test d1 | |
| 146 | 5 1 test d1/d2 |
|
146 | 5 1 test d1/d2 | |
| 147 | 5 1 test d1/d2/b |
|
147 | 5 1 test d1/d2/b | |
| 148 | <?xml version="1.0"?> |
|
148 | <?xml version="1.0"?> | |
| 149 | <log> |
|
149 | <log> | |
| 150 | <logentry |
|
150 | <logentry | |
| 151 | revision="5"> |
|
151 | revision="5"> | |
| 152 | <author>test</author> |
|
152 | <author>test</author> | |
| 153 | <date/> |
|
153 | <date/> | |
| 154 | <paths> |
|
154 | <paths> | |
| 155 | <path |
|
155 | <path | |
| 156 | action="D">/b</path> |
|
156 | action="D">/b</path> | |
| 157 | </paths> |
|
157 | </paths> | |
| 158 | <msg>remove a file</msg> |
|
158 | <msg>remove a file</msg> | |
| 159 | </logentry> |
|
159 | </logentry> | |
| 160 | </log> |
|
160 | </log> | |
| 161 | a: |
|
161 | a: | |
| 162 | c |
|
162 | c | |
| 163 | d1 |
|
163 | d1 | |
| 164 |
|
164 | |||
| 165 | a-hg-wc: |
|
165 | a-hg-wc: | |
| 166 | c |
|
166 | c | |
| 167 | d1 |
|
167 | d1 | |
| 168 | % executable |
|
168 | % executable | |
| 169 | 5:f205b3636d77 |
|
169 | 5:ff42e473c340 | |
| 170 | assuming destination a-hg |
|
170 | assuming destination a-hg | |
| 171 | initializing svn wc 'a-hg-wc' |
|
171 | initializing svn wc 'a-hg-wc' | |
| 172 | scanning source... |
|
172 | scanning source... | |
| 173 | sorting... |
|
173 | sorting... | |
| 174 | converting... |
|
174 | converting... | |
| 175 | 0 make a file executable |
|
175 | 0 make a file executable | |
| 176 | At revision 6. |
|
176 | At revision 6. | |
| 177 | 6 6 test . |
|
177 | 6 6 test . | |
| 178 | 6 6 test c |
|
178 | 6 6 test c | |
| 179 | 6 1 test d1 |
|
179 | 6 1 test d1 | |
| 180 | 6 1 test d1/d2 |
|
180 | 6 1 test d1/d2 | |
| 181 | 6 1 test d1/d2/b |
|
181 | 6 1 test d1/d2/b | |
| 182 | <?xml version="1.0"?> |
|
182 | <?xml version="1.0"?> | |
| 183 | <log> |
|
183 | <log> | |
| 184 | <logentry |
|
184 | <logentry | |
| 185 | revision="6"> |
|
185 | revision="6"> | |
| 186 | <author>test</author> |
|
186 | <author>test</author> | |
| 187 | <date/> |
|
187 | <date/> | |
| 188 | <paths> |
|
188 | <paths> | |
| 189 | <path |
|
189 | <path | |
| 190 | action="M">/c</path> |
|
190 | action="M">/c</path> | |
| 191 | </paths> |
|
191 | </paths> | |
| 192 | <msg>make a file executable</msg> |
|
192 | <msg>make a file executable</msg> | |
| 193 | </logentry> |
|
193 | </logentry> | |
| 194 | </log> |
|
194 | </log> | |
| 195 | executable |
|
195 | executable | |
| 196 | % executable in new directory |
|
196 | % executable in new directory | |
| 197 | adding d1/a |
|
197 | adding d1/a | |
| 198 | assuming destination a-hg |
|
198 | assuming destination a-hg | |
| 199 | initializing svn repo 'a-hg' |
|
199 | initializing svn repo 'a-hg' | |
| 200 | initializing svn wc 'a-hg-wc' |
|
200 | initializing svn wc 'a-hg-wc' | |
| 201 | scanning source... |
|
201 | scanning source... | |
| 202 | sorting... |
|
202 | sorting... | |
| 203 | converting... |
|
203 | converting... | |
| 204 | 0 add executable file in new directory |
|
204 | 0 add executable file in new directory | |
| 205 | At revision 1. |
|
205 | At revision 1. | |
| 206 | 1 1 test . |
|
206 | 1 1 test . | |
| 207 | 1 1 test d1 |
|
207 | 1 1 test d1 | |
| 208 | 1 1 test d1/a |
|
208 | 1 1 test d1/a | |
| 209 | <?xml version="1.0"?> |
|
209 | <?xml version="1.0"?> | |
| 210 | <log> |
|
210 | <log> | |
| 211 | <logentry |
|
211 | <logentry | |
| 212 | revision="1"> |
|
212 | revision="1"> | |
| 213 | <author>test</author> |
|
213 | <author>test</author> | |
| 214 | <date/> |
|
214 | <date/> | |
| 215 | <paths> |
|
215 | <paths> | |
| 216 | <path |
|
216 | <path | |
| 217 | action="A">/d1</path> |
|
217 | action="A">/d1</path> | |
| 218 | <path |
|
218 | <path | |
| 219 | action="A">/d1/a</path> |
|
219 | action="A">/d1/a</path> | |
| 220 | </paths> |
|
220 | </paths> | |
| 221 | <msg>add executable file in new directory</msg> |
|
221 | <msg>add executable file in new directory</msg> | |
| 222 | </logentry> |
|
222 | </logentry> | |
| 223 | </log> |
|
223 | </log> | |
| 224 | executable |
|
224 | executable | |
| 225 | % copy to new directory |
|
225 | % copy to new directory | |
| 226 | assuming destination a-hg |
|
226 | assuming destination a-hg | |
| 227 | initializing svn wc 'a-hg-wc' |
|
227 | initializing svn wc 'a-hg-wc' | |
| 228 | scanning source... |
|
228 | scanning source... | |
| 229 | sorting... |
|
229 | sorting... | |
| 230 | converting... |
|
230 | converting... | |
| 231 | 0 copy file to new directory |
|
231 | 0 copy file to new directory | |
| 232 | At revision 2. |
|
232 | At revision 2. | |
| 233 | 2 2 test . |
|
233 | 2 2 test . | |
| 234 | 2 1 test d1 |
|
234 | 2 1 test d1 | |
| 235 | 2 1 test d1/a |
|
235 | 2 1 test d1/a | |
| 236 | 2 2 test d2 |
|
236 | 2 2 test d2 | |
| 237 | 2 2 test d2/a |
|
237 | 2 2 test d2/a | |
| 238 | <?xml version="1.0"?> |
|
238 | <?xml version="1.0"?> | |
| 239 | <log> |
|
239 | <log> | |
| 240 | <logentry |
|
240 | <logentry | |
| 241 | revision="2"> |
|
241 | revision="2"> | |
| 242 | <author>test</author> |
|
242 | <author>test</author> | |
| 243 | <date/> |
|
243 | <date/> | |
| 244 | <paths> |
|
244 | <paths> | |
| 245 | <path |
|
245 | <path | |
| 246 | action="A">/d2</path> |
|
246 | action="A">/d2</path> | |
| 247 | <path |
|
247 | <path | |
| 248 | copyfrom-path="/d1/a" |
|
248 | copyfrom-path="/d1/a" | |
| 249 | copyfrom-rev="1" |
|
249 | copyfrom-rev="1" | |
| 250 | action="A">/d2/a</path> |
|
250 | action="A">/d2/a</path> | |
| 251 | </paths> |
|
251 | </paths> | |
| 252 | <msg>copy file to new directory</msg> |
|
252 | <msg>copy file to new directory</msg> | |
| 253 | </logentry> |
|
253 | </logentry> | |
| 254 | </log> |
|
254 | </log> | |
| 255 | % branchy history |
|
255 | % branchy history | |
| 256 | adding b |
|
256 | adding b | |
| 257 | adding left-1 |
|
257 | adding left-1 | |
| 258 | adding left-2 |
|
258 | adding left-2 | |
| 259 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
259 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 260 | adding right-1 |
|
260 | adding right-1 | |
| 261 | created new head |
|
261 | created new head | |
| 262 | adding right-2 |
|
262 | adding right-2 | |
| 263 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
263 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 264 | merging b |
|
264 | merging b | |
| 265 | warning: conflicts during merge. |
|
265 | warning: conflicts during merge. | |
| 266 | merging b failed! |
|
266 | merging b failed! | |
| 267 | 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
267 | 2 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 268 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
268 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | |
| 269 | assuming destination b-hg |
|
269 | assuming destination b-hg | |
| 270 | initializing svn repo 'b-hg' |
|
270 | initializing svn repo 'b-hg' | |
| 271 | initializing svn wc 'b-hg-wc' |
|
271 | initializing svn wc 'b-hg-wc' | |
| 272 | scanning source... |
|
272 | scanning source... | |
| 273 | sorting... |
|
273 | sorting... | |
| 274 | converting... |
|
274 | converting... | |
| 275 | 5 base |
|
275 | 5 base | |
| 276 | 4 left-1 |
|
276 | 4 left-1 | |
| 277 | 3 left-2 |
|
277 | 3 left-2 | |
| 278 | 2 right-1 |
|
278 | 2 right-1 | |
| 279 | 1 right-2 |
|
279 | 1 right-2 | |
| 280 | 0 merge |
|
280 | 0 merge | |
| 281 | % expect 4 changes |
|
281 | % expect 4 changes | |
| 282 | At revision 4. |
|
282 | At revision 4. | |
| 283 | 4 4 test . |
|
283 | 4 4 test . | |
| 284 | 4 3 test b |
|
284 | 4 3 test b | |
| 285 | 4 2 test left-1 |
|
285 | 4 2 test left-1 | |
| 286 | 4 3 test left-2 |
|
286 | 4 3 test left-2 | |
| 287 | 4 4 test right-1 |
|
287 | 4 4 test right-1 | |
| 288 | 4 4 test right-2 |
|
288 | 4 4 test right-2 | |
| 289 | <?xml version="1.0"?> |
|
289 | <?xml version="1.0"?> | |
| 290 | <log> |
|
290 | <log> | |
| 291 | <logentry |
|
291 | <logentry | |
| 292 | revision="4"> |
|
292 | revision="4"> | |
| 293 | <author>test</author> |
|
293 | <author>test</author> | |
| 294 | <date/> |
|
294 | <date/> | |
| 295 | <paths> |
|
295 | <paths> | |
| 296 | <path |
|
296 | <path | |
| 297 | action="A">/right-1</path> |
|
297 | action="A">/right-1</path> | |
| 298 | <path |
|
298 | <path | |
| 299 | action="A">/right-2</path> |
|
299 | action="A">/right-2</path> | |
| 300 | </paths> |
|
300 | </paths> | |
| 301 | <msg>merge</msg> |
|
301 | <msg>merge</msg> | |
| 302 | </logentry> |
|
302 | </logentry> | |
| 303 | <logentry |
|
303 | <logentry | |
| 304 | revision="3"> |
|
304 | revision="3"> | |
| 305 | <author>test</author> |
|
305 | <author>test</author> | |
| 306 | <date/> |
|
306 | <date/> | |
| 307 | <paths> |
|
307 | <paths> | |
| 308 | <path |
|
308 | <path | |
| 309 | action="M">/b</path> |
|
309 | action="M">/b</path> | |
| 310 | <path |
|
310 | <path | |
| 311 | action="A">/left-2</path> |
|
311 | action="A">/left-2</path> | |
| 312 | </paths> |
|
312 | </paths> | |
| 313 | <msg>left-2</msg> |
|
313 | <msg>left-2</msg> | |
| 314 | </logentry> |
|
314 | </logentry> | |
| 315 | <logentry |
|
315 | <logentry | |
| 316 | revision="2"> |
|
316 | revision="2"> | |
| 317 | <author>test</author> |
|
317 | <author>test</author> | |
| 318 | <date/> |
|
318 | <date/> | |
| 319 | <paths> |
|
319 | <paths> | |
| 320 | <path |
|
320 | <path | |
| 321 | action="M">/b</path> |
|
321 | action="M">/b</path> | |
| 322 | <path |
|
322 | <path | |
| 323 | action="A">/left-1</path> |
|
323 | action="A">/left-1</path> | |
| 324 | </paths> |
|
324 | </paths> | |
| 325 | <msg>left-1</msg> |
|
325 | <msg>left-1</msg> | |
| 326 | </logentry> |
|
326 | </logentry> | |
| 327 | <logentry |
|
327 | <logentry | |
| 328 | revision="1"> |
|
328 | revision="1"> | |
| 329 | <author>test</author> |
|
329 | <author>test</author> | |
| 330 | <date/> |
|
330 | <date/> | |
| 331 | <paths> |
|
331 | <paths> | |
| 332 | <path |
|
332 | <path | |
| 333 | action="A">/b</path> |
|
333 | action="A">/b</path> | |
| 334 | </paths> |
|
334 | </paths> | |
| 335 | <msg>base</msg> |
|
335 | <msg>base</msg> | |
| 336 | </logentry> |
|
336 | </logentry> | |
| 337 | </log> |
|
337 | </log> | |
| @@ -1,72 +1,72 b'' | |||||
| 1 | % create tla archive |
|
1 | % create tla archive | |
| 2 | % initialize tla repo |
|
2 | % initialize tla repo | |
| 3 | * creating version tla@mercurial--convert/tla--test--0 |
|
3 | * creating version tla@mercurial--convert/tla--test--0 | |
| 4 | * imported tla@mercurial--convert/tla--test--0 |
|
4 | * imported tla@mercurial--convert/tla--test--0 | |
| 5 | % create initial files |
|
5 | % create initial files | |
| 6 | A/ .arch-ids |
|
6 | A/ .arch-ids | |
| 7 | A/ src |
|
7 | A/ src | |
| 8 | A/ src/.arch-ids |
|
8 | A/ src/.arch-ids | |
| 9 | A .arch-ids/a.id |
|
9 | A .arch-ids/a.id | |
| 10 | A a |
|
10 | A a | |
| 11 | A src/.arch-ids/=id |
|
11 | A src/.arch-ids/=id | |
| 12 | A src/.arch-ids/b.id |
|
12 | A src/.arch-ids/b.id | |
| 13 | A src/b |
|
13 | A src/b | |
| 14 | * update pristine tree (tla@mercurial--convert/tla--test--0--base-0 => tla--test--0--patch-1) |
|
14 | * update pristine tree (tla@mercurial--convert/tla--test--0--base-0 => tla--test--0--patch-1) | |
| 15 | * committed tla@mercurial--convert/tla--test--0--patch-1 |
|
15 | * committed tla@mercurial--convert/tla--test--0--patch-1 | |
| 16 | % create link file and modify a |
|
16 | % create link file and modify a | |
| 17 | A src/.arch-ids/a-link.id |
|
17 | A src/.arch-ids/a-link.id | |
| 18 | A src/a-link |
|
18 | A src/a-link | |
| 19 | M a |
|
19 | M a | |
| 20 | * update pristine tree (tla@mercurial--convert/tla--test--0--patch-1 => tla--test--0--patch-2) |
|
20 | * update pristine tree (tla@mercurial--convert/tla--test--0--patch-1 => tla--test--0--patch-2) | |
| 21 | * committed tla@mercurial--convert/tla--test--0--patch-2 |
|
21 | * committed tla@mercurial--convert/tla--test--0--patch-2 | |
| 22 | % create second link and modify b |
|
22 | % create second link and modify b | |
| 23 | A src/.arch-ids/a-link-2.id |
|
23 | A src/.arch-ids/a-link-2.id | |
| 24 | A src/a-link-2 |
|
24 | A src/a-link-2 | |
| 25 | Mb src/b |
|
25 | Mb src/b | |
| 26 | * update pristine tree (tla@mercurial--convert/tla--test--0--patch-2 => tla--test--0--patch-3) |
|
26 | * update pristine tree (tla@mercurial--convert/tla--test--0--patch-2 => tla--test--0--patch-3) | |
| 27 | * committed tla@mercurial--convert/tla--test--0--patch-3 |
|
27 | * committed tla@mercurial--convert/tla--test--0--patch-3 | |
| 28 | % b file to link and a-link-2 to regular file |
|
28 | % b file to link and a-link-2 to regular file | |
| 29 | fl src/b |
|
29 | fl src/b | |
| 30 | lf src/a-link-2 |
|
30 | lf src/a-link-2 | |
| 31 | * update pristine tree (tla@mercurial--convert/tla--test--0--patch-3 => tla--test--0--patch-4) |
|
31 | * update pristine tree (tla@mercurial--convert/tla--test--0--patch-3 => tla--test--0--patch-4) | |
| 32 | * committed tla@mercurial--convert/tla--test--0--patch-4 |
|
32 | * committed tla@mercurial--convert/tla--test--0--patch-4 | |
| 33 | % move a-link-2 file and src directory |
|
33 | % move a-link-2 file and src directory | |
| 34 | D/ src/.arch-ids |
|
34 | D/ src/.arch-ids | |
| 35 | A/ test/.arch-ids |
|
35 | A/ test/.arch-ids | |
| 36 | /> src test |
|
36 | /> src test | |
| 37 | => src/.arch-ids/a-link-2.id .arch-ids/c.id |
|
37 | => src/.arch-ids/a-link-2.id .arch-ids/c.id | |
| 38 | => src/a-link-2 c |
|
38 | => src/a-link-2 c | |
| 39 | => src/.arch-ids/=id test/.arch-ids/=id |
|
39 | => src/.arch-ids/=id test/.arch-ids/=id | |
| 40 | => src/.arch-ids/a-link.id test/.arch-ids/a-link.id |
|
40 | => src/.arch-ids/a-link.id test/.arch-ids/a-link.id | |
| 41 | => src/.arch-ids/b.id test/.arch-ids/b.id |
|
41 | => src/.arch-ids/b.id test/.arch-ids/b.id | |
| 42 | * update pristine tree (tla@mercurial--convert/tla--test--0--patch-4 => tla--test--0--patch-5) |
|
42 | * update pristine tree (tla@mercurial--convert/tla--test--0--patch-4 => tla--test--0--patch-5) | |
| 43 | * committed tla@mercurial--convert/tla--test--0--patch-5 |
|
43 | * committed tla@mercurial--convert/tla--test--0--patch-5 | |
| 44 | % converting tla repo to Mercurial |
|
44 | % converting tla repo to Mercurial | |
| 45 | initializing destination tla-repo-hg repository |
|
45 | initializing destination tla-repo-hg repository | |
| 46 | analyzing tree version tla@mercurial--convert/tla--test--0... |
|
46 | analyzing tree version tla@mercurial--convert/tla--test--0... | |
| 47 | scanning source... |
|
47 | scanning source... | |
| 48 | sorting... |
|
48 | sorting... | |
| 49 | converting... |
|
49 | converting... | |
| 50 | 5 initial import |
|
50 | 5 initial import | |
| 51 | 4 added a file, src and src/b (binary) |
|
51 | 4 added a file, src and src/b (binary) | |
| 52 | 3 added link to a and modify a |
|
52 | 3 added link to a and modify a | |
| 53 | 2 added second link and modify b |
|
53 | 2 added second link and modify b | |
| 54 | 1 file to link and link to file test |
|
54 | 1 file to link and link to file test | |
| 55 | 0 move and rename a-link-2 file and src directory |
|
55 | 0 move and rename a-link-2 file and src directory | |
| 56 | % show graph log |
|
56 | % show graph log | |
| 57 | o 5 "move and rename a-link-2 file and src directory" files: c src/a-link src/a-link-2 src/b test/a-link test/b |
|
57 | o 5 "move and rename a-link-2 file and src directory" files: c src/a-link src/a-link-2 src/b test/a-link test/b | |
| 58 | | |
|
58 | | | |
| 59 | o 4 "file to link and link to file test" files: src/a-link-2 src/b |
|
59 | o 4 "file to link and link to file test" files: src/a-link-2 src/b | |
| 60 | | |
|
60 | | | |
| 61 | o 3 "added second link and modify b" files: src/a-link-2 src/b |
|
61 | o 3 "added second link and modify b" files: src/a-link-2 src/b | |
| 62 | | |
|
62 | | | |
| 63 | o 2 "added link to a and modify a" files: a src/a-link |
|
63 | o 2 "added link to a and modify a" files: a src/a-link | |
| 64 | | |
|
64 | | | |
| 65 | o 1 "added a file, src and src/b (binary)" files: a src/b |
|
65 | o 1 "added a file, src and src/b (binary)" files: a src/b | |
| 66 | | |
|
66 | | | |
| 67 | o 0 "initial import" files: |
|
67 | o 0 "initial import" files: | |
| 68 |
|
68 | |||
| 69 | c4072c4b72e1cabace081888efa148ee80ca3cbb 644 a |
|
69 | c4072c4b72e1cabace081888efa148ee80ca3cbb 644 a | |
| 70 | 623942606de842342ac7b221ae9ccabc13b5d8c8 644 c |
|
70 | 0201ac32a3a8e86e303dff60366382a54b48a72e 644 c | |
| 71 | 43b4308708a4b36340566684df2e2a074b12ceb0 644 @ test/a-link |
|
71 | c0067ba5ff0b7c9a3eb17270839d04614c435623 644 @ test/a-link | |
| 72 | 73773e3389ef7ec5a070519b74895d2eaa4ad5db 644 @ test/b |
|
72 | 375f4263d86feacdea7e3c27100abd1560f2a973 644 @ test/b | |
| @@ -1,37 +1,37 b'' | |||||
| 1 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 2 | searching for copies back to rev 1 |
|
2 | searching for copies back to rev 1 | |
| 3 | unmatched files in other: |
|
3 | unmatched files in other: | |
| 4 | b |
|
4 | b | |
| 5 | c |
|
5 | c | |
| 6 | all copies found (* = to merge, ! = divergent): |
|
6 | all copies found (* = to merge, ! = divergent): | |
| 7 | c -> a * |
|
7 | c -> a * | |
| 8 | b -> a * |
|
8 | b -> a * | |
| 9 | checking for directory renames |
|
9 | checking for directory renames | |
| 10 | resolving manifests |
|
10 | resolving manifests | |
| 11 | overwrite None partial False |
|
11 | overwrite None partial False | |
| 12 |
ancestor 583c7b748052 local fb3948d97f07+ remote |
|
12 | ancestor 583c7b748052 local fb3948d97f07+ remote 7f1309517659 | |
| 13 | a: remote moved to c -> m |
|
13 | a: remote moved to c -> m | |
| 14 | a: remote moved to b -> m |
|
14 | a: remote moved to b -> m | |
| 15 | preserving a for resolve of b |
|
15 | preserving a for resolve of b | |
| 16 | preserving a for resolve of c |
|
16 | preserving a for resolve of c | |
| 17 | removing a |
|
17 | removing a | |
| 18 | update: a 1/2 files (50.00%) |
|
18 | update: a 1/2 files (50.00%) | |
| 19 | picked tool 'internal:merge' for b (binary False symlink False) |
|
19 | picked tool 'internal:merge' for b (binary False symlink False) | |
| 20 | merging a and b to b |
|
20 | merging a and b to b | |
| 21 |
my b@fb3948d97f07+ other b@ |
|
21 | my b@fb3948d97f07+ other b@7f1309517659 ancestor a@583c7b748052 | |
| 22 | premerge successful |
|
22 | premerge successful | |
| 23 | update: a 2/2 files (100.00%) |
|
23 | update: a 2/2 files (100.00%) | |
| 24 | picked tool 'internal:merge' for c (binary False symlink False) |
|
24 | picked tool 'internal:merge' for c (binary False symlink False) | |
| 25 | merging a and c to c |
|
25 | merging a and c to c | |
| 26 |
my c@fb3948d97f07+ other c@ |
|
26 | my c@fb3948d97f07+ other c@7f1309517659 ancestor a@583c7b748052 | |
| 27 | premerge successful |
|
27 | premerge successful | |
| 28 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
28 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 29 | (branch merge, don't forget to commit) |
|
29 | (branch merge, don't forget to commit) | |
| 30 | -- b -- |
|
30 | -- b -- | |
| 31 | 0 |
|
31 | 0 | |
| 32 | 1 |
|
32 | 1 | |
| 33 | 2 |
|
33 | 2 | |
| 34 | -- c -- |
|
34 | -- c -- | |
| 35 | 0 |
|
35 | 0 | |
| 36 | 1 |
|
36 | 1 | |
| 37 | 2 |
|
37 | 2 | |
| @@ -1,52 +1,52 b'' | |||||
| 1 | A b |
|
1 | A b | |
| 2 | b |
|
2 | b | |
| 3 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
3 | b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
| 4 | committed changeset 1:386a3cc01532710ca78aed9a54fa2f459c04f29c |
|
4 | committed changeset 1:76973b01f66a012648546c979ea4c41de9e7d8cd | |
| 5 | we should see two history entries |
|
5 | we should see two history entries | |
| 6 |
changeset: 1: |
|
6 | changeset: 1:76973b01f66a | |
| 7 | tag: tip |
|
7 | tag: tip | |
| 8 | user: test |
|
8 | user: test | |
| 9 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
9 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 10 | files: b |
|
10 | files: b | |
| 11 | description: |
|
11 | description: | |
| 12 | 2 |
|
12 | 2 | |
| 13 |
|
13 | |||
| 14 |
|
14 | |||
| 15 | changeset: 0:33aaa84a386b |
|
15 | changeset: 0:33aaa84a386b | |
| 16 | user: test |
|
16 | user: test | |
| 17 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
17 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 18 | files: a |
|
18 | files: a | |
| 19 | description: |
|
19 | description: | |
| 20 | 1 |
|
20 | 1 | |
| 21 |
|
21 | |||
| 22 |
|
22 | |||
| 23 | we should see one log entry for a |
|
23 | we should see one log entry for a | |
| 24 | changeset: 0:33aaa84a386b |
|
24 | changeset: 0:33aaa84a386b | |
| 25 | user: test |
|
25 | user: test | |
| 26 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
26 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 27 | summary: 1 |
|
27 | summary: 1 | |
| 28 |
|
28 | |||
| 29 | this should show a revision linked to changeset 0 |
|
29 | this should show a revision linked to changeset 0 | |
| 30 | rev offset length base linkrev nodeid p1 p2 |
|
30 | rev offset length base linkrev nodeid p1 p2 | |
| 31 | 0 0 3 0 0 b789fdd96dc2 000000000000 000000000000 |
|
31 | 0 0 3 0 0 b789fdd96dc2 000000000000 000000000000 | |
| 32 | we should see one log entry for b |
|
32 | we should see one log entry for b | |
| 33 |
changeset: 1: |
|
33 | changeset: 1:76973b01f66a | |
| 34 | tag: tip |
|
34 | tag: tip | |
| 35 | user: test |
|
35 | user: test | |
| 36 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
36 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 37 | summary: 2 |
|
37 | summary: 2 | |
| 38 |
|
38 | |||
| 39 | this should show a revision linked to changeset 1 |
|
39 | this should show a revision linked to changeset 1 | |
| 40 | rev offset length base linkrev nodeid p1 p2 |
|
40 | rev offset length base linkrev nodeid p1 p2 | |
| 41 |
0 0 65 0 1 |
|
41 | 0 0 65 0 1 37d9b5d994ea 000000000000 000000000000 | |
| 42 | this should show the rename information in the metadata |
|
42 | this should show the rename information in the metadata | |
|
|
43 | copy: a | |||
| 43 | copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
44 | copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
| 44 | copy: a |
|
45 | 4999f120a3b88713bbefddd195cf5133 .hg/store/data/b.i | |
| 45 | ed156f22f0a6fde642de0b5eba0cbbb2 .hg/store/data/b.i |
|
|||
| 46 | 60b725f10c9c85c70d97880dfe8191b3 bsum |
|
46 | 60b725f10c9c85c70d97880dfe8191b3 bsum | |
| 47 | 60b725f10c9c85c70d97880dfe8191b3 asum |
|
47 | 60b725f10c9c85c70d97880dfe8191b3 asum | |
| 48 | checking changesets |
|
48 | checking changesets | |
| 49 | checking manifests |
|
49 | checking manifests | |
| 50 | crosschecking files in changesets and manifests |
|
50 | crosschecking files in changesets and manifests | |
| 51 | checking files |
|
51 | checking files | |
| 52 | 2 files, 2 changesets, 2 total revisions |
|
52 | 2 files, 2 changesets, 2 total revisions | |
| @@ -1,47 +1,47 b'' | |||||
| 1 | # should fail - foo is not managed |
|
1 | # should fail - foo is not managed | |
| 2 | foo: not copying - file is not managed |
|
2 | foo: not copying - file is not managed | |
| 3 | abort: no files to copy |
|
3 | abort: no files to copy | |
| 4 | ? foo |
|
4 | ? foo | |
| 5 | # dry-run; print a warning that this is not a real copy; foo is added |
|
5 | # dry-run; print a warning that this is not a real copy; foo is added | |
| 6 | foo has not been committed yet, so no copy data will be stored for bar. |
|
6 | foo has not been committed yet, so no copy data will be stored for bar. | |
| 7 | A foo |
|
7 | A foo | |
| 8 | # should print a warning that this is not a real copy; bar is added |
|
8 | # should print a warning that this is not a real copy; bar is added | |
| 9 | foo has not been committed yet, so no copy data will be stored for bar. |
|
9 | foo has not been committed yet, so no copy data will be stored for bar. | |
| 10 | A bar |
|
10 | A bar | |
| 11 | # should print a warning that this is not a real copy; foo is added |
|
11 | # should print a warning that this is not a real copy; foo is added | |
| 12 | bar has not been committed yet, so no copy data will be stored for foo. |
|
12 | bar has not been committed yet, so no copy data will be stored for foo. | |
| 13 | A foo |
|
13 | A foo | |
| 14 | # dry-run; should show that foo is clean |
|
14 | # dry-run; should show that foo is clean | |
| 15 | C foo |
|
15 | C foo | |
| 16 | # should show copy |
|
16 | # should show copy | |
| 17 | A bar |
|
17 | A bar | |
| 18 | foo |
|
18 | foo | |
| 19 | # shouldn't show copy |
|
19 | # shouldn't show copy | |
| 20 | # should match |
|
20 | # should match | |
| 21 | rev offset length base linkrev nodeid p1 p2 |
|
21 | rev offset length base linkrev nodeid p1 p2 | |
| 22 | 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 |
|
22 | 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 | |
| 23 | bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
|
23 | bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd | |
| 24 | # should not be renamed |
|
24 | # should not be renamed | |
| 25 | bar not renamed |
|
25 | bar not renamed | |
| 26 | # should show copy |
|
26 | # should show copy | |
| 27 | M bar |
|
27 | M bar | |
| 28 | foo |
|
28 | foo | |
| 29 | # should show no parents for tip |
|
29 | # should show no parents for tip | |
| 30 | rev offset length base linkrev nodeid p1 p2 |
|
30 | rev offset length base linkrev nodeid p1 p2 | |
| 31 |
0 0 69 0 1 |
|
31 | 0 0 69 0 1 7711d36246cc 000000000000 000000000000 | |
| 32 |
1 69 6 1 2 |
|
32 | 1 69 6 1 2 bdf70a2b8d03 7711d36246cc 000000000000 | |
| 33 |
2 75 8 |
|
33 | 2 75 81 1 3 b2558327ea8d 000000000000 000000000000 | |
| 34 | # should match |
|
34 | # should match | |
| 35 | rev offset length base linkrev nodeid p1 p2 |
|
35 | rev offset length base linkrev nodeid p1 p2 | |
| 36 | 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 |
|
36 | 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 | |
| 37 | 1 5 7 1 2 dd12c926cf16 2ed2a3912a0b 000000000000 |
|
37 | 1 5 7 1 2 dd12c926cf16 2ed2a3912a0b 000000000000 | |
| 38 | bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17 |
|
38 | bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17 | |
| 39 | # should show no copies |
|
39 | # should show no copies | |
| 40 | # copy --after on an added file |
|
40 | # copy --after on an added file | |
| 41 | A baz |
|
41 | A baz | |
| 42 | bar |
|
42 | bar | |
| 43 | # foo was clean: |
|
43 | # foo was clean: | |
| 44 | C foo |
|
44 | C foo | |
| 45 | # but it's considered modified after a copy --after --force |
|
45 | # but it's considered modified after a copy --after --force | |
| 46 | M foo |
|
46 | M foo | |
| 47 | bar |
|
47 | bar | |
| @@ -1,5 +1,5 b'' | |||||
| 1 | adding a |
|
1 | adding a | |
| 2 | b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
2 | b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
| 3 | a renamed from b:9a263dd772e0159ddfa70fb8a448bb6c7ec8c69f |
|
3 | a renamed from b:37d9b5d994eab34eda9c16b195ace52c7b129980 | |
| 4 | % test with --rev |
|
4 | % test with --rev | |
| 5 | b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
|
5 | b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
| @@ -1,39 +1,39 b'' | |||||
| 1 | created new head |
|
1 | created new head | |
| 2 |
changeset: 1: |
|
2 | changeset: 1:d9da848d0adf | |
| 3 | user: test |
|
3 | user: test | |
| 4 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
4 | date: Mon Jan 12 13:46:40 1970 +0000 | |
| 5 | summary: cp foo bar; change both |
|
5 | summary: cp foo bar; change both | |
| 6 |
|
6 | |||
| 7 | searching for copies back to rev 1 |
|
7 | searching for copies back to rev 1 | |
| 8 | unmatched files in other: |
|
8 | unmatched files in other: | |
| 9 | bar |
|
9 | bar | |
| 10 | all copies found (* = to merge, ! = divergent): |
|
10 | all copies found (* = to merge, ! = divergent): | |
| 11 | bar -> foo * |
|
11 | bar -> foo * | |
| 12 | checking for directory renames |
|
12 | checking for directory renames | |
| 13 | resolving manifests |
|
13 | resolving manifests | |
| 14 | overwrite None partial False |
|
14 | overwrite None partial False | |
| 15 |
ancestor 310fd17130da local 2092631ce82b+ remote |
|
15 | ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf | |
| 16 | foo: versions differ -> m |
|
16 | foo: versions differ -> m | |
| 17 | foo: remote copied to bar -> m |
|
17 | foo: remote copied to bar -> m | |
| 18 | preserving foo for resolve of bar |
|
18 | preserving foo for resolve of bar | |
| 19 | preserving foo for resolve of foo |
|
19 | preserving foo for resolve of foo | |
| 20 | update: foo 1/2 files (50.00%) |
|
20 | update: foo 1/2 files (50.00%) | |
| 21 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
21 | picked tool 'internal:merge' for bar (binary False symlink False) | |
| 22 | merging foo and bar to bar |
|
22 | merging foo and bar to bar | |
| 23 |
my bar@2092631ce82b+ other bar@ |
|
23 | my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da | |
| 24 | premerge successful |
|
24 | premerge successful | |
| 25 | update: foo 2/2 files (100.00%) |
|
25 | update: foo 2/2 files (100.00%) | |
| 26 | picked tool 'internal:merge' for foo (binary False symlink False) |
|
26 | picked tool 'internal:merge' for foo (binary False symlink False) | |
| 27 | merging foo |
|
27 | merging foo | |
| 28 |
my foo@2092631ce82b+ other foo@ |
|
28 | my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da | |
| 29 | premerge successful |
|
29 | premerge successful | |
| 30 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
30 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 31 | (branch merge, don't forget to commit) |
|
31 | (branch merge, don't forget to commit) | |
| 32 | -- foo -- |
|
32 | -- foo -- | |
| 33 | line 0 |
|
33 | line 0 | |
| 34 | line 1 |
|
34 | line 1 | |
| 35 | line 2-1 |
|
35 | line 2-1 | |
| 36 | -- bar -- |
|
36 | -- bar -- | |
| 37 | line 0 |
|
37 | line 0 | |
| 38 | line 1 |
|
38 | line 1 | |
| 39 | line 2-2 |
|
39 | line 2-2 | |
| @@ -1,605 +1,605 b'' | |||||
| 1 | adding b |
|
1 | adding b | |
| 2 | adding a |
|
2 | adding a | |
| 3 | adding a |
|
3 | adding a | |
| 4 |
changeset: 6: |
|
4 | changeset: 6:b7682196df1c | |
| 5 | tag: tip |
|
5 | tag: tip | |
| 6 | user: test |
|
6 | user: test | |
| 7 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
7 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 8 | summary: change c |
|
8 | summary: change c | |
| 9 |
|
9 | |||
| 10 | diff -r a3b6a9e4507e -r 38d962e6234d c |
|
10 | diff -r 1a6696706df2 -r b7682196df1c c | |
| 11 | --- a/c Thu Jan 01 00:00:00 1970 +0000 |
|
11 | --- a/c Thu Jan 01 00:00:00 1970 +0000 | |
| 12 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
12 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | |
| 13 | @@ -1,1 +1,2 @@ |
|
13 | @@ -1,1 +1,2 @@ | |
| 14 | b |
|
14 | b | |
| 15 | +c |
|
15 | +c | |
| 16 |
|
16 | |||
| 17 |
changeset: 5: |
|
17 | changeset: 5:1a6696706df2 | |
| 18 | user: test |
|
18 | user: test | |
| 19 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
19 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 20 | summary: mv b |
|
20 | summary: mv b | |
| 21 |
|
21 | |||
| 22 |
diff -r 52e848cdcd88 -r |
|
22 | diff -r 52e848cdcd88 -r 1a6696706df2 b | |
| 23 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
|
23 | --- a/b Thu Jan 01 00:00:00 1970 +0000 | |
| 24 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
24 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 25 | @@ -1,1 +0,0 @@ |
|
25 | @@ -1,1 +0,0 @@ | |
| 26 | -b |
|
26 | -b | |
| 27 |
diff -r 52e848cdcd88 -r |
|
27 | diff -r 52e848cdcd88 -r 1a6696706df2 c | |
| 28 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
28 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 29 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 |
|
29 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | |
| 30 | @@ -0,0 +1,1 @@ |
|
30 | @@ -0,0 +1,1 @@ | |
| 31 | +b |
|
31 | +b | |
| 32 |
|
32 | |||
| 33 | changeset: 4:52e848cdcd88 |
|
33 | changeset: 4:52e848cdcd88 | |
| 34 | user: test |
|
34 | user: test | |
| 35 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
35 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 36 | summary: del2 a |
|
36 | summary: del2 a | |
| 37 |
|
37 | |||
| 38 | diff -r 01de2d66a28d -r 52e848cdcd88 a |
|
38 | diff -r 01de2d66a28d -r 52e848cdcd88 a | |
| 39 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
39 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
| 40 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
40 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 41 | @@ -1,1 +0,0 @@ |
|
41 | @@ -1,1 +0,0 @@ | |
| 42 | -b |
|
42 | -b | |
| 43 |
|
43 | |||
| 44 | changeset: 3:01de2d66a28d |
|
44 | changeset: 3:01de2d66a28d | |
| 45 | user: test |
|
45 | user: test | |
| 46 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
46 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 47 | summary: second a |
|
47 | summary: second a | |
| 48 |
|
48 | |||
| 49 | diff -r be3ebcc91739 -r 01de2d66a28d a |
|
49 | diff -r be3ebcc91739 -r 01de2d66a28d a | |
| 50 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
50 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 51 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
51 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
| 52 | @@ -0,0 +1,1 @@ |
|
52 | @@ -0,0 +1,1 @@ | |
| 53 | +b |
|
53 | +b | |
| 54 |
|
54 | |||
| 55 | changeset: 2:be3ebcc91739 |
|
55 | changeset: 2:be3ebcc91739 | |
| 56 | user: test |
|
56 | user: test | |
| 57 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
57 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 58 | summary: del a |
|
58 | summary: del a | |
| 59 |
|
59 | |||
| 60 | diff -r 5ed941583260 -r be3ebcc91739 a |
|
60 | diff -r 5ed941583260 -r be3ebcc91739 a | |
| 61 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
61 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
| 62 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
62 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 63 | @@ -1,1 +0,0 @@ |
|
63 | @@ -1,1 +0,0 @@ | |
| 64 | -a |
|
64 | -a | |
| 65 |
|
65 | |||
| 66 | changeset: 1:5ed941583260 |
|
66 | changeset: 1:5ed941583260 | |
| 67 | user: test |
|
67 | user: test | |
| 68 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
68 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 69 | summary: first a |
|
69 | summary: first a | |
| 70 |
|
70 | |||
| 71 | diff -r 6563da9dcf87 -r 5ed941583260 a |
|
71 | diff -r 6563da9dcf87 -r 5ed941583260 a | |
| 72 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
72 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 73 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
73 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
| 74 | @@ -0,0 +1,1 @@ |
|
74 | @@ -0,0 +1,1 @@ | |
| 75 | +a |
|
75 | +a | |
| 76 |
|
76 | |||
| 77 | changeset: 0:6563da9dcf87 |
|
77 | changeset: 0:6563da9dcf87 | |
| 78 | user: test |
|
78 | user: test | |
| 79 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
79 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 80 | summary: b |
|
80 | summary: b | |
| 81 |
|
81 | |||
| 82 | diff -r 000000000000 -r 6563da9dcf87 b |
|
82 | diff -r 000000000000 -r 6563da9dcf87 b | |
| 83 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
83 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 84 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
84 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
| 85 | @@ -0,0 +1,1 @@ |
|
85 | @@ -0,0 +1,1 @@ | |
| 86 | +b |
|
86 | +b | |
| 87 |
|
87 | |||
| 88 | % tip - two revisions |
|
88 | % tip - two revisions | |
| 89 | 200 Script output follows |
|
89 | 200 Script output follows | |
| 90 |
|
90 | |||
| 91 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
91 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |
| 92 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
92 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> | |
| 93 | <head> |
|
93 | <head> | |
| 94 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
94 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | |
| 95 | <meta name="robots" content="index, nofollow" /> |
|
95 | <meta name="robots" content="index, nofollow" /> | |
| 96 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
96 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | |
| 97 |
|
97 | |||
| 98 | <title>test: a history</title> |
|
98 | <title>test: a history</title> | |
| 99 | <link rel="alternate" type="application/atom+xml" |
|
99 | <link rel="alternate" type="application/atom+xml" | |
| 100 | href="/atom-log/tip/a" title="Atom feed for test:a" /> |
|
100 | href="/atom-log/tip/a" title="Atom feed for test:a" /> | |
| 101 | <link rel="alternate" type="application/rss+xml" |
|
101 | <link rel="alternate" type="application/rss+xml" | |
| 102 | href="/rss-log/tip/a" title="RSS feed for test:a" /> |
|
102 | href="/rss-log/tip/a" title="RSS feed for test:a" /> | |
| 103 | </head> |
|
103 | </head> | |
| 104 | <body> |
|
104 | <body> | |
| 105 |
|
105 | |||
| 106 | <div class="container"> |
|
106 | <div class="container"> | |
| 107 | <div class="menu"> |
|
107 | <div class="menu"> | |
| 108 | <div class="logo"> |
|
108 | <div class="logo"> | |
| 109 | <a href="http://mercurial.selenic.com/"> |
|
109 | <a href="http://mercurial.selenic.com/"> | |
| 110 | <img src="/static/hglogo.png" alt="mercurial" /></a> |
|
110 | <img src="/static/hglogo.png" alt="mercurial" /></a> | |
| 111 | </div> |
|
111 | </div> | |
| 112 | <ul> |
|
112 | <ul> | |
| 113 | <li><a href="/shortlog/01de2d66a28d">log</a></li> |
|
113 | <li><a href="/shortlog/01de2d66a28d">log</a></li> | |
| 114 | <li><a href="/graph/01de2d66a28d">graph</a></li> |
|
114 | <li><a href="/graph/01de2d66a28d">graph</a></li> | |
| 115 | <li><a href="/tags">tags</a></li> |
|
115 | <li><a href="/tags">tags</a></li> | |
| 116 | <li><a href="/branches">branches</a></li> |
|
116 | <li><a href="/branches">branches</a></li> | |
| 117 | </ul> |
|
117 | </ul> | |
| 118 | <ul> |
|
118 | <ul> | |
| 119 | <li><a href="/rev/01de2d66a28d">changeset</a></li> |
|
119 | <li><a href="/rev/01de2d66a28d">changeset</a></li> | |
| 120 | <li><a href="/file/01de2d66a28d">browse</a></li> |
|
120 | <li><a href="/file/01de2d66a28d">browse</a></li> | |
| 121 | </ul> |
|
121 | </ul> | |
| 122 | <ul> |
|
122 | <ul> | |
| 123 | <li><a href="/file/01de2d66a28d/a">file</a></li> |
|
123 | <li><a href="/file/01de2d66a28d/a">file</a></li> | |
| 124 | <li><a href="/diff/01de2d66a28d/a">diff</a></li> |
|
124 | <li><a href="/diff/01de2d66a28d/a">diff</a></li> | |
| 125 | <li><a href="/annotate/01de2d66a28d/a">annotate</a></li> |
|
125 | <li><a href="/annotate/01de2d66a28d/a">annotate</a></li> | |
| 126 | <li class="active">file log</li> |
|
126 | <li class="active">file log</li> | |
| 127 | <li><a href="/raw-file/01de2d66a28d/a">raw</a></li> |
|
127 | <li><a href="/raw-file/01de2d66a28d/a">raw</a></li> | |
| 128 | </ul> |
|
128 | </ul> | |
| 129 | </div> |
|
129 | </div> | |
| 130 |
|
130 | |||
| 131 | <div class="main"> |
|
131 | <div class="main"> | |
| 132 | <h2><a href="/">test</a></h2> |
|
132 | <h2><a href="/">test</a></h2> | |
| 133 | <h3>log a</h3> |
|
133 | <h3>log a</h3> | |
| 134 |
|
134 | |||
| 135 | <form class="search" action="/log"> |
|
135 | <form class="search" action="/log"> | |
| 136 |
|
136 | |||
| 137 | <p><input name="rev" id="search1" type="text" size="30" /></p> |
|
137 | <p><input name="rev" id="search1" type="text" size="30" /></p> | |
| 138 | <div id="hint">find changesets by author, revision, |
|
138 | <div id="hint">find changesets by author, revision, | |
| 139 | files, or words in the commit message</div> |
|
139 | files, or words in the commit message</div> | |
| 140 | </form> |
|
140 | </form> | |
| 141 |
|
141 | |||
| 142 | <div class="navigate"> |
|
142 | <div class="navigate"> | |
| 143 | <a href="/log/01de2d66a28d/a?revcount=30">less</a> |
|
143 | <a href="/log/01de2d66a28d/a?revcount=30">less</a> | |
| 144 | <a href="/log/01de2d66a28d/a?revcount=120">more</a> |
|
144 | <a href="/log/01de2d66a28d/a?revcount=120">more</a> | |
| 145 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div> |
|
145 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div> | |
| 146 |
|
146 | |||
| 147 | <table class="bigtable"> |
|
147 | <table class="bigtable"> | |
| 148 | <tr> |
|
148 | <tr> | |
| 149 | <th class="age">age</th> |
|
149 | <th class="age">age</th> | |
| 150 | <th class="author">author</th> |
|
150 | <th class="author">author</th> | |
| 151 | <th class="description">description</th> |
|
151 | <th class="description">description</th> | |
| 152 | </tr> |
|
152 | </tr> | |
| 153 | <tr class="parity0"> |
|
153 | <tr class="parity0"> | |
| 154 | <td class="age">1970-01-01</td> |
|
154 | <td class="age">1970-01-01</td> | |
| 155 | <td class="author">test</td> |
|
155 | <td class="author">test</td> | |
| 156 | <td class="description"><a href="/rev/01de2d66a28d">second a</a></td> |
|
156 | <td class="description"><a href="/rev/01de2d66a28d">second a</a></td> | |
| 157 | </tr> |
|
157 | </tr> | |
| 158 | <tr class="parity1"> |
|
158 | <tr class="parity1"> | |
| 159 | <td class="age">1970-01-01</td> |
|
159 | <td class="age">1970-01-01</td> | |
| 160 | <td class="author">test</td> |
|
160 | <td class="author">test</td> | |
| 161 | <td class="description"><a href="/rev/5ed941583260">first a</a></td> |
|
161 | <td class="description"><a href="/rev/5ed941583260">first a</a></td> | |
| 162 | </tr> |
|
162 | </tr> | |
| 163 |
|
163 | |||
| 164 | </table> |
|
164 | </table> | |
| 165 |
|
165 | |||
| 166 | <div class="navigate"> |
|
166 | <div class="navigate"> | |
| 167 | <a href="/log/01de2d66a28d/a?revcount=30">less</a> |
|
167 | <a href="/log/01de2d66a28d/a?revcount=30">less</a> | |
| 168 | <a href="/log/01de2d66a28d/a?revcount=120">more</a> |
|
168 | <a href="/log/01de2d66a28d/a?revcount=120">more</a> | |
| 169 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> |
|
169 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> | |
| 170 | </div> |
|
170 | </div> | |
| 171 |
|
171 | |||
| 172 | </div> |
|
172 | </div> | |
| 173 | </div> |
|
173 | </div> | |
| 174 |
|
174 | |||
| 175 |
|
175 | |||
| 176 |
|
176 | |||
| 177 | </body> |
|
177 | </body> | |
| 178 | </html> |
|
178 | </html> | |
| 179 |
|
179 | |||
| 180 | % second version - two revisions |
|
180 | % second version - two revisions | |
| 181 | 200 Script output follows |
|
181 | 200 Script output follows | |
| 182 |
|
182 | |||
| 183 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
183 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |
| 184 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
184 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> | |
| 185 | <head> |
|
185 | <head> | |
| 186 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
186 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | |
| 187 | <meta name="robots" content="index, nofollow" /> |
|
187 | <meta name="robots" content="index, nofollow" /> | |
| 188 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
188 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | |
| 189 |
|
189 | |||
| 190 | <title>test: a history</title> |
|
190 | <title>test: a history</title> | |
| 191 | <link rel="alternate" type="application/atom+xml" |
|
191 | <link rel="alternate" type="application/atom+xml" | |
| 192 | href="/atom-log/tip/a" title="Atom feed for test:a" /> |
|
192 | href="/atom-log/tip/a" title="Atom feed for test:a" /> | |
| 193 | <link rel="alternate" type="application/rss+xml" |
|
193 | <link rel="alternate" type="application/rss+xml" | |
| 194 | href="/rss-log/tip/a" title="RSS feed for test:a" /> |
|
194 | href="/rss-log/tip/a" title="RSS feed for test:a" /> | |
| 195 | </head> |
|
195 | </head> | |
| 196 | <body> |
|
196 | <body> | |
| 197 |
|
197 | |||
| 198 | <div class="container"> |
|
198 | <div class="container"> | |
| 199 | <div class="menu"> |
|
199 | <div class="menu"> | |
| 200 | <div class="logo"> |
|
200 | <div class="logo"> | |
| 201 | <a href="http://mercurial.selenic.com/"> |
|
201 | <a href="http://mercurial.selenic.com/"> | |
| 202 | <img src="/static/hglogo.png" alt="mercurial" /></a> |
|
202 | <img src="/static/hglogo.png" alt="mercurial" /></a> | |
| 203 | </div> |
|
203 | </div> | |
| 204 | <ul> |
|
204 | <ul> | |
| 205 | <li><a href="/shortlog/01de2d66a28d">log</a></li> |
|
205 | <li><a href="/shortlog/01de2d66a28d">log</a></li> | |
| 206 | <li><a href="/graph/01de2d66a28d">graph</a></li> |
|
206 | <li><a href="/graph/01de2d66a28d">graph</a></li> | |
| 207 | <li><a href="/tags">tags</a></li> |
|
207 | <li><a href="/tags">tags</a></li> | |
| 208 | <li><a href="/branches">branches</a></li> |
|
208 | <li><a href="/branches">branches</a></li> | |
| 209 | </ul> |
|
209 | </ul> | |
| 210 | <ul> |
|
210 | <ul> | |
| 211 | <li><a href="/rev/01de2d66a28d">changeset</a></li> |
|
211 | <li><a href="/rev/01de2d66a28d">changeset</a></li> | |
| 212 | <li><a href="/file/01de2d66a28d">browse</a></li> |
|
212 | <li><a href="/file/01de2d66a28d">browse</a></li> | |
| 213 | </ul> |
|
213 | </ul> | |
| 214 | <ul> |
|
214 | <ul> | |
| 215 | <li><a href="/file/01de2d66a28d/a">file</a></li> |
|
215 | <li><a href="/file/01de2d66a28d/a">file</a></li> | |
| 216 | <li><a href="/diff/01de2d66a28d/a">diff</a></li> |
|
216 | <li><a href="/diff/01de2d66a28d/a">diff</a></li> | |
| 217 | <li><a href="/annotate/01de2d66a28d/a">annotate</a></li> |
|
217 | <li><a href="/annotate/01de2d66a28d/a">annotate</a></li> | |
| 218 | <li class="active">file log</li> |
|
218 | <li class="active">file log</li> | |
| 219 | <li><a href="/raw-file/01de2d66a28d/a">raw</a></li> |
|
219 | <li><a href="/raw-file/01de2d66a28d/a">raw</a></li> | |
| 220 | </ul> |
|
220 | </ul> | |
| 221 | </div> |
|
221 | </div> | |
| 222 |
|
222 | |||
| 223 | <div class="main"> |
|
223 | <div class="main"> | |
| 224 | <h2><a href="/">test</a></h2> |
|
224 | <h2><a href="/">test</a></h2> | |
| 225 | <h3>log a</h3> |
|
225 | <h3>log a</h3> | |
| 226 |
|
226 | |||
| 227 | <form class="search" action="/log"> |
|
227 | <form class="search" action="/log"> | |
| 228 |
|
228 | |||
| 229 | <p><input name="rev" id="search1" type="text" size="30" /></p> |
|
229 | <p><input name="rev" id="search1" type="text" size="30" /></p> | |
| 230 | <div id="hint">find changesets by author, revision, |
|
230 | <div id="hint">find changesets by author, revision, | |
| 231 | files, or words in the commit message</div> |
|
231 | files, or words in the commit message</div> | |
| 232 | </form> |
|
232 | </form> | |
| 233 |
|
233 | |||
| 234 | <div class="navigate"> |
|
234 | <div class="navigate"> | |
| 235 | <a href="/log/01de2d66a28d/a?revcount=30">less</a> |
|
235 | <a href="/log/01de2d66a28d/a?revcount=30">less</a> | |
| 236 | <a href="/log/01de2d66a28d/a?revcount=120">more</a> |
|
236 | <a href="/log/01de2d66a28d/a?revcount=120">more</a> | |
| 237 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div> |
|
237 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div> | |
| 238 |
|
238 | |||
| 239 | <table class="bigtable"> |
|
239 | <table class="bigtable"> | |
| 240 | <tr> |
|
240 | <tr> | |
| 241 | <th class="age">age</th> |
|
241 | <th class="age">age</th> | |
| 242 | <th class="author">author</th> |
|
242 | <th class="author">author</th> | |
| 243 | <th class="description">description</th> |
|
243 | <th class="description">description</th> | |
| 244 | </tr> |
|
244 | </tr> | |
| 245 | <tr class="parity0"> |
|
245 | <tr class="parity0"> | |
| 246 | <td class="age">1970-01-01</td> |
|
246 | <td class="age">1970-01-01</td> | |
| 247 | <td class="author">test</td> |
|
247 | <td class="author">test</td> | |
| 248 | <td class="description"><a href="/rev/01de2d66a28d">second a</a></td> |
|
248 | <td class="description"><a href="/rev/01de2d66a28d">second a</a></td> | |
| 249 | </tr> |
|
249 | </tr> | |
| 250 | <tr class="parity1"> |
|
250 | <tr class="parity1"> | |
| 251 | <td class="age">1970-01-01</td> |
|
251 | <td class="age">1970-01-01</td> | |
| 252 | <td class="author">test</td> |
|
252 | <td class="author">test</td> | |
| 253 | <td class="description"><a href="/rev/5ed941583260">first a</a></td> |
|
253 | <td class="description"><a href="/rev/5ed941583260">first a</a></td> | |
| 254 | </tr> |
|
254 | </tr> | |
| 255 |
|
255 | |||
| 256 | </table> |
|
256 | </table> | |
| 257 |
|
257 | |||
| 258 | <div class="navigate"> |
|
258 | <div class="navigate"> | |
| 259 | <a href="/log/01de2d66a28d/a?revcount=30">less</a> |
|
259 | <a href="/log/01de2d66a28d/a?revcount=30">less</a> | |
| 260 | <a href="/log/01de2d66a28d/a?revcount=120">more</a> |
|
260 | <a href="/log/01de2d66a28d/a?revcount=120">more</a> | |
| 261 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> |
|
261 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> | |
| 262 | </div> |
|
262 | </div> | |
| 263 |
|
263 | |||
| 264 | </div> |
|
264 | </div> | |
| 265 | </div> |
|
265 | </div> | |
| 266 |
|
266 | |||
| 267 |
|
267 | |||
| 268 |
|
268 | |||
| 269 | </body> |
|
269 | </body> | |
| 270 | </html> |
|
270 | </html> | |
| 271 |
|
271 | |||
| 272 | % first deleted - one revision |
|
272 | % first deleted - one revision | |
| 273 | 200 Script output follows |
|
273 | 200 Script output follows | |
| 274 |
|
274 | |||
| 275 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
275 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |
| 276 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
276 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> | |
| 277 | <head> |
|
277 | <head> | |
| 278 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
278 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | |
| 279 | <meta name="robots" content="index, nofollow" /> |
|
279 | <meta name="robots" content="index, nofollow" /> | |
| 280 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
280 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | |
| 281 |
|
281 | |||
| 282 | <title>test: a history</title> |
|
282 | <title>test: a history</title> | |
| 283 | <link rel="alternate" type="application/atom+xml" |
|
283 | <link rel="alternate" type="application/atom+xml" | |
| 284 | href="/atom-log/tip/a" title="Atom feed for test:a" /> |
|
284 | href="/atom-log/tip/a" title="Atom feed for test:a" /> | |
| 285 | <link rel="alternate" type="application/rss+xml" |
|
285 | <link rel="alternate" type="application/rss+xml" | |
| 286 | href="/rss-log/tip/a" title="RSS feed for test:a" /> |
|
286 | href="/rss-log/tip/a" title="RSS feed for test:a" /> | |
| 287 | </head> |
|
287 | </head> | |
| 288 | <body> |
|
288 | <body> | |
| 289 |
|
289 | |||
| 290 | <div class="container"> |
|
290 | <div class="container"> | |
| 291 | <div class="menu"> |
|
291 | <div class="menu"> | |
| 292 | <div class="logo"> |
|
292 | <div class="logo"> | |
| 293 | <a href="http://mercurial.selenic.com/"> |
|
293 | <a href="http://mercurial.selenic.com/"> | |
| 294 | <img src="/static/hglogo.png" alt="mercurial" /></a> |
|
294 | <img src="/static/hglogo.png" alt="mercurial" /></a> | |
| 295 | </div> |
|
295 | </div> | |
| 296 | <ul> |
|
296 | <ul> | |
| 297 | <li><a href="/shortlog/5ed941583260">log</a></li> |
|
297 | <li><a href="/shortlog/5ed941583260">log</a></li> | |
| 298 | <li><a href="/graph/5ed941583260">graph</a></li> |
|
298 | <li><a href="/graph/5ed941583260">graph</a></li> | |
| 299 | <li><a href="/tags">tags</a></li> |
|
299 | <li><a href="/tags">tags</a></li> | |
| 300 | <li><a href="/branches">branches</a></li> |
|
300 | <li><a href="/branches">branches</a></li> | |
| 301 | </ul> |
|
301 | </ul> | |
| 302 | <ul> |
|
302 | <ul> | |
| 303 | <li><a href="/rev/5ed941583260">changeset</a></li> |
|
303 | <li><a href="/rev/5ed941583260">changeset</a></li> | |
| 304 | <li><a href="/file/5ed941583260">browse</a></li> |
|
304 | <li><a href="/file/5ed941583260">browse</a></li> | |
| 305 | </ul> |
|
305 | </ul> | |
| 306 | <ul> |
|
306 | <ul> | |
| 307 | <li><a href="/file/5ed941583260/a">file</a></li> |
|
307 | <li><a href="/file/5ed941583260/a">file</a></li> | |
| 308 | <li><a href="/diff/5ed941583260/a">diff</a></li> |
|
308 | <li><a href="/diff/5ed941583260/a">diff</a></li> | |
| 309 | <li><a href="/annotate/5ed941583260/a">annotate</a></li> |
|
309 | <li><a href="/annotate/5ed941583260/a">annotate</a></li> | |
| 310 | <li class="active">file log</li> |
|
310 | <li class="active">file log</li> | |
| 311 | <li><a href="/raw-file/5ed941583260/a">raw</a></li> |
|
311 | <li><a href="/raw-file/5ed941583260/a">raw</a></li> | |
| 312 | </ul> |
|
312 | </ul> | |
| 313 | </div> |
|
313 | </div> | |
| 314 |
|
314 | |||
| 315 | <div class="main"> |
|
315 | <div class="main"> | |
| 316 | <h2><a href="/">test</a></h2> |
|
316 | <h2><a href="/">test</a></h2> | |
| 317 | <h3>log a</h3> |
|
317 | <h3>log a</h3> | |
| 318 |
|
318 | |||
| 319 | <form class="search" action="/log"> |
|
319 | <form class="search" action="/log"> | |
| 320 |
|
320 | |||
| 321 | <p><input name="rev" id="search1" type="text" size="30" /></p> |
|
321 | <p><input name="rev" id="search1" type="text" size="30" /></p> | |
| 322 | <div id="hint">find changesets by author, revision, |
|
322 | <div id="hint">find changesets by author, revision, | |
| 323 | files, or words in the commit message</div> |
|
323 | files, or words in the commit message</div> | |
| 324 | </form> |
|
324 | </form> | |
| 325 |
|
325 | |||
| 326 | <div class="navigate"> |
|
326 | <div class="navigate"> | |
| 327 | <a href="/log/5ed941583260/a?revcount=30">less</a> |
|
327 | <a href="/log/5ed941583260/a?revcount=30">less</a> | |
| 328 | <a href="/log/5ed941583260/a?revcount=120">more</a> |
|
328 | <a href="/log/5ed941583260/a?revcount=120">more</a> | |
| 329 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div> |
|
329 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div> | |
| 330 |
|
330 | |||
| 331 | <table class="bigtable"> |
|
331 | <table class="bigtable"> | |
| 332 | <tr> |
|
332 | <tr> | |
| 333 | <th class="age">age</th> |
|
333 | <th class="age">age</th> | |
| 334 | <th class="author">author</th> |
|
334 | <th class="author">author</th> | |
| 335 | <th class="description">description</th> |
|
335 | <th class="description">description</th> | |
| 336 | </tr> |
|
336 | </tr> | |
| 337 | <tr class="parity0"> |
|
337 | <tr class="parity0"> | |
| 338 | <td class="age">1970-01-01</td> |
|
338 | <td class="age">1970-01-01</td> | |
| 339 | <td class="author">test</td> |
|
339 | <td class="author">test</td> | |
| 340 | <td class="description"><a href="/rev/5ed941583260">first a</a></td> |
|
340 | <td class="description"><a href="/rev/5ed941583260">first a</a></td> | |
| 341 | </tr> |
|
341 | </tr> | |
| 342 |
|
342 | |||
| 343 | </table> |
|
343 | </table> | |
| 344 |
|
344 | |||
| 345 | <div class="navigate"> |
|
345 | <div class="navigate"> | |
| 346 | <a href="/log/5ed941583260/a?revcount=30">less</a> |
|
346 | <a href="/log/5ed941583260/a?revcount=30">less</a> | |
| 347 | <a href="/log/5ed941583260/a?revcount=120">more</a> |
|
347 | <a href="/log/5ed941583260/a?revcount=120">more</a> | |
| 348 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> |
|
348 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> | |
| 349 | </div> |
|
349 | </div> | |
| 350 |
|
350 | |||
| 351 | </div> |
|
351 | </div> | |
| 352 | </div> |
|
352 | </div> | |
| 353 |
|
353 | |||
| 354 |
|
354 | |||
| 355 |
|
355 | |||
| 356 | </body> |
|
356 | </body> | |
| 357 | </html> |
|
357 | </html> | |
| 358 |
|
358 | |||
| 359 | % first version - one revision |
|
359 | % first version - one revision | |
| 360 | 200 Script output follows |
|
360 | 200 Script output follows | |
| 361 |
|
361 | |||
| 362 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
362 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |
| 363 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
363 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> | |
| 364 | <head> |
|
364 | <head> | |
| 365 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
365 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | |
| 366 | <meta name="robots" content="index, nofollow" /> |
|
366 | <meta name="robots" content="index, nofollow" /> | |
| 367 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
367 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | |
| 368 |
|
368 | |||
| 369 | <title>test: a history</title> |
|
369 | <title>test: a history</title> | |
| 370 | <link rel="alternate" type="application/atom+xml" |
|
370 | <link rel="alternate" type="application/atom+xml" | |
| 371 | href="/atom-log/tip/a" title="Atom feed for test:a" /> |
|
371 | href="/atom-log/tip/a" title="Atom feed for test:a" /> | |
| 372 | <link rel="alternate" type="application/rss+xml" |
|
372 | <link rel="alternate" type="application/rss+xml" | |
| 373 | href="/rss-log/tip/a" title="RSS feed for test:a" /> |
|
373 | href="/rss-log/tip/a" title="RSS feed for test:a" /> | |
| 374 | </head> |
|
374 | </head> | |
| 375 | <body> |
|
375 | <body> | |
| 376 |
|
376 | |||
| 377 | <div class="container"> |
|
377 | <div class="container"> | |
| 378 | <div class="menu"> |
|
378 | <div class="menu"> | |
| 379 | <div class="logo"> |
|
379 | <div class="logo"> | |
| 380 | <a href="http://mercurial.selenic.com/"> |
|
380 | <a href="http://mercurial.selenic.com/"> | |
| 381 | <img src="/static/hglogo.png" alt="mercurial" /></a> |
|
381 | <img src="/static/hglogo.png" alt="mercurial" /></a> | |
| 382 | </div> |
|
382 | </div> | |
| 383 | <ul> |
|
383 | <ul> | |
| 384 | <li><a href="/shortlog/5ed941583260">log</a></li> |
|
384 | <li><a href="/shortlog/5ed941583260">log</a></li> | |
| 385 | <li><a href="/graph/5ed941583260">graph</a></li> |
|
385 | <li><a href="/graph/5ed941583260">graph</a></li> | |
| 386 | <li><a href="/tags">tags</a></li> |
|
386 | <li><a href="/tags">tags</a></li> | |
| 387 | <li><a href="/branches">branches</a></li> |
|
387 | <li><a href="/branches">branches</a></li> | |
| 388 | </ul> |
|
388 | </ul> | |
| 389 | <ul> |
|
389 | <ul> | |
| 390 | <li><a href="/rev/5ed941583260">changeset</a></li> |
|
390 | <li><a href="/rev/5ed941583260">changeset</a></li> | |
| 391 | <li><a href="/file/5ed941583260">browse</a></li> |
|
391 | <li><a href="/file/5ed941583260">browse</a></li> | |
| 392 | </ul> |
|
392 | </ul> | |
| 393 | <ul> |
|
393 | <ul> | |
| 394 | <li><a href="/file/5ed941583260/a">file</a></li> |
|
394 | <li><a href="/file/5ed941583260/a">file</a></li> | |
| 395 | <li><a href="/diff/5ed941583260/a">diff</a></li> |
|
395 | <li><a href="/diff/5ed941583260/a">diff</a></li> | |
| 396 | <li><a href="/annotate/5ed941583260/a">annotate</a></li> |
|
396 | <li><a href="/annotate/5ed941583260/a">annotate</a></li> | |
| 397 | <li class="active">file log</li> |
|
397 | <li class="active">file log</li> | |
| 398 | <li><a href="/raw-file/5ed941583260/a">raw</a></li> |
|
398 | <li><a href="/raw-file/5ed941583260/a">raw</a></li> | |
| 399 | </ul> |
|
399 | </ul> | |
| 400 | </div> |
|
400 | </div> | |
| 401 |
|
401 | |||
| 402 | <div class="main"> |
|
402 | <div class="main"> | |
| 403 | <h2><a href="/">test</a></h2> |
|
403 | <h2><a href="/">test</a></h2> | |
| 404 | <h3>log a</h3> |
|
404 | <h3>log a</h3> | |
| 405 |
|
405 | |||
| 406 | <form class="search" action="/log"> |
|
406 | <form class="search" action="/log"> | |
| 407 |
|
407 | |||
| 408 | <p><input name="rev" id="search1" type="text" size="30" /></p> |
|
408 | <p><input name="rev" id="search1" type="text" size="30" /></p> | |
| 409 | <div id="hint">find changesets by author, revision, |
|
409 | <div id="hint">find changesets by author, revision, | |
| 410 | files, or words in the commit message</div> |
|
410 | files, or words in the commit message</div> | |
| 411 | </form> |
|
411 | </form> | |
| 412 |
|
412 | |||
| 413 | <div class="navigate"> |
|
413 | <div class="navigate"> | |
| 414 | <a href="/log/5ed941583260/a?revcount=30">less</a> |
|
414 | <a href="/log/5ed941583260/a?revcount=30">less</a> | |
| 415 | <a href="/log/5ed941583260/a?revcount=120">more</a> |
|
415 | <a href="/log/5ed941583260/a?revcount=120">more</a> | |
| 416 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div> |
|
416 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> </div> | |
| 417 |
|
417 | |||
| 418 | <table class="bigtable"> |
|
418 | <table class="bigtable"> | |
| 419 | <tr> |
|
419 | <tr> | |
| 420 | <th class="age">age</th> |
|
420 | <th class="age">age</th> | |
| 421 | <th class="author">author</th> |
|
421 | <th class="author">author</th> | |
| 422 | <th class="description">description</th> |
|
422 | <th class="description">description</th> | |
| 423 | </tr> |
|
423 | </tr> | |
| 424 | <tr class="parity0"> |
|
424 | <tr class="parity0"> | |
| 425 | <td class="age">1970-01-01</td> |
|
425 | <td class="age">1970-01-01</td> | |
| 426 | <td class="author">test</td> |
|
426 | <td class="author">test</td> | |
| 427 | <td class="description"><a href="/rev/5ed941583260">first a</a></td> |
|
427 | <td class="description"><a href="/rev/5ed941583260">first a</a></td> | |
| 428 | </tr> |
|
428 | </tr> | |
| 429 |
|
429 | |||
| 430 | </table> |
|
430 | </table> | |
| 431 |
|
431 | |||
| 432 | <div class="navigate"> |
|
432 | <div class="navigate"> | |
| 433 | <a href="/log/5ed941583260/a?revcount=30">less</a> |
|
433 | <a href="/log/5ed941583260/a?revcount=30">less</a> | |
| 434 | <a href="/log/5ed941583260/a?revcount=120">more</a> |
|
434 | <a href="/log/5ed941583260/a?revcount=120">more</a> | |
| 435 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> |
|
435 | | <a href="/log/5ed941583260/a">(0)</a> <a href="/log/tip/a">tip</a> | |
| 436 | </div> |
|
436 | </div> | |
| 437 |
|
437 | |||
| 438 | </div> |
|
438 | </div> | |
| 439 | </div> |
|
439 | </div> | |
| 440 |
|
440 | |||
| 441 |
|
441 | |||
| 442 |
|
442 | |||
| 443 | </body> |
|
443 | </body> | |
| 444 | </html> |
|
444 | </html> | |
| 445 |
|
445 | |||
| 446 | % before addition - error |
|
446 | % before addition - error | |
| 447 | 404 Not Found |
|
447 | 404 Not Found | |
| 448 |
|
448 | |||
| 449 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
|
449 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |
| 450 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> |
|
450 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> | |
| 451 | <head> |
|
451 | <head> | |
| 452 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> |
|
452 | <link rel="icon" href="/static/hgicon.png" type="image/png" /> | |
| 453 | <meta name="robots" content="index, nofollow" /> |
|
453 | <meta name="robots" content="index, nofollow" /> | |
| 454 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> |
|
454 | <link rel="stylesheet" href="/static/style-paper.css" type="text/css" /> | |
| 455 |
|
455 | |||
| 456 | <title>test: error</title> |
|
456 | <title>test: error</title> | |
| 457 | </head> |
|
457 | </head> | |
| 458 | <body> |
|
458 | <body> | |
| 459 |
|
459 | |||
| 460 | <div class="container"> |
|
460 | <div class="container"> | |
| 461 | <div class="menu"> |
|
461 | <div class="menu"> | |
| 462 | <div class="logo"> |
|
462 | <div class="logo"> | |
| 463 | <a href="http://mercurial.selenic.com/"> |
|
463 | <a href="http://mercurial.selenic.com/"> | |
| 464 | <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a> |
|
464 | <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a> | |
| 465 | </div> |
|
465 | </div> | |
| 466 | <ul> |
|
466 | <ul> | |
| 467 | <li><a href="/shortlog">log</a></li> |
|
467 | <li><a href="/shortlog">log</a></li> | |
| 468 | <li><a href="/graph">graph</a></li> |
|
468 | <li><a href="/graph">graph</a></li> | |
| 469 | <li><a href="/tags">tags</a></li> |
|
469 | <li><a href="/tags">tags</a></li> | |
| 470 | <li><a href="/branches">branches</a></li> |
|
470 | <li><a href="/branches">branches</a></li> | |
| 471 | </ul> |
|
471 | </ul> | |
| 472 | </div> |
|
472 | </div> | |
| 473 |
|
473 | |||
| 474 | <div class="main"> |
|
474 | <div class="main"> | |
| 475 |
|
475 | |||
| 476 | <h2><a href="/">test</a></h2> |
|
476 | <h2><a href="/">test</a></h2> | |
| 477 | <h3>error</h3> |
|
477 | <h3>error</h3> | |
| 478 |
|
478 | |||
| 479 | <form class="search" action="/log"> |
|
479 | <form class="search" action="/log"> | |
| 480 |
|
480 | |||
| 481 | <p><input name="rev" id="search1" type="text" size="30"></p> |
|
481 | <p><input name="rev" id="search1" type="text" size="30"></p> | |
| 482 | <div id="hint">find changesets by author, revision, |
|
482 | <div id="hint">find changesets by author, revision, | |
| 483 | files, or words in the commit message</div> |
|
483 | files, or words in the commit message</div> | |
| 484 | </form> |
|
484 | </form> | |
| 485 |
|
485 | |||
| 486 | <div class="description"> |
|
486 | <div class="description"> | |
| 487 | <p> |
|
487 | <p> | |
| 488 | An error occurred while processing your request: |
|
488 | An error occurred while processing your request: | |
| 489 | </p> |
|
489 | </p> | |
| 490 | <p> |
|
490 | <p> | |
| 491 | a@6563da9dcf87: not found in manifest |
|
491 | a@6563da9dcf87: not found in manifest | |
| 492 | </p> |
|
492 | </p> | |
| 493 | </div> |
|
493 | </div> | |
| 494 | </div> |
|
494 | </div> | |
| 495 | </div> |
|
495 | </div> | |
| 496 |
|
496 | |||
| 497 |
|
497 | |||
| 498 |
|
498 | |||
| 499 | </body> |
|
499 | </body> | |
| 500 | </html> |
|
500 | </html> | |
| 501 |
|
501 | |||
| 502 | % should show base link, use spartan because it shows it |
|
502 | % should show base link, use spartan because it shows it | |
| 503 | 200 Script output follows |
|
503 | 200 Script output follows | |
| 504 |
|
504 | |||
| 505 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
|
505 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> | |
| 506 | <html> |
|
506 | <html> | |
| 507 | <head> |
|
507 | <head> | |
| 508 | <link rel="icon" href="/static/hgicon.png" type="image/png"> |
|
508 | <link rel="icon" href="/static/hgicon.png" type="image/png"> | |
| 509 | <meta name="robots" content="index, nofollow" /> |
|
509 | <meta name="robots" content="index, nofollow" /> | |
| 510 | <link rel="stylesheet" href="/static/style.css" type="text/css" /> |
|
510 | <link rel="stylesheet" href="/static/style.css" type="text/css" /> | |
| 511 |
|
511 | |||
| 512 | <title>test: c history</title> |
|
512 | <title>test: c history</title> | |
| 513 | <link rel="alternate" type="application/atom+xml" |
|
513 | <link rel="alternate" type="application/atom+xml" | |
| 514 | href="/atom-log/tip/c" title="Atom feed for test:c"> |
|
514 | href="/atom-log/tip/c" title="Atom feed for test:c"> | |
| 515 | <link rel="alternate" type="application/rss+xml" |
|
515 | <link rel="alternate" type="application/rss+xml" | |
| 516 | href="/rss-log/tip/c" title="RSS feed for test:c"> |
|
516 | href="/rss-log/tip/c" title="RSS feed for test:c"> | |
| 517 | </head> |
|
517 | </head> | |
| 518 | <body> |
|
518 | <body> | |
| 519 |
|
519 | |||
| 520 | <div class="buttons"> |
|
520 | <div class="buttons"> | |
| 521 | <a href="/log?style=spartan">changelog</a> |
|
521 | <a href="/log?style=spartan">changelog</a> | |
| 522 | <a href="/shortlog?style=spartan">shortlog</a> |
|
522 | <a href="/shortlog?style=spartan">shortlog</a> | |
| 523 | <a href="/graph?style=spartan">graph</a> |
|
523 | <a href="/graph?style=spartan">graph</a> | |
| 524 | <a href="/tags?style=spartan">tags</a> |
|
524 | <a href="/tags?style=spartan">tags</a> | |
| 525 | <a href="/branches?style=spartan">branches</a> |
|
525 | <a href="/branches?style=spartan">branches</a> | |
| 526 |
<a href="/file/ |
|
526 | <a href="/file/b7682196df1c/c?style=spartan">file</a> | |
| 527 |
<a href="/annotate/ |
|
527 | <a href="/annotate/b7682196df1c/c?style=spartan">annotate</a> | |
| 528 | <a type="application/rss+xml" href="/rss-log/tip/c">rss</a> |
|
528 | <a type="application/rss+xml" href="/rss-log/tip/c">rss</a> | |
| 529 | <a type="application/atom+xml" href="/atom-log/tip/c" title="Atom feed for test:c">atom</a> |
|
529 | <a type="application/atom+xml" href="/atom-log/tip/c" title="Atom feed for test:c">atom</a> | |
| 530 | </div> |
|
530 | </div> | |
| 531 |
|
531 | |||
| 532 | <h2>c revision history</h2> |
|
532 | <h2>c revision history</h2> | |
| 533 |
|
533 | |||
| 534 |
<p>navigate: <small class="navigate"><a href="/log/ |
|
534 | <p>navigate: <small class="navigate"><a href="/log/1a6696706df2/c?style=spartan">(0)</a> <a href="/log/tip/c?style=spartan">tip</a> </small></p> | |
| 535 |
|
535 | |||
| 536 | <table class="logEntry parity0"> |
|
536 | <table class="logEntry parity0"> | |
| 537 | <tr> |
|
537 | <tr> | |
| 538 | <th class="age">1970-01-01:</th> |
|
538 | <th class="age">1970-01-01:</th> | |
| 539 |
<th class="firstline"><a href="/rev/ |
|
539 | <th class="firstline"><a href="/rev/b7682196df1c?style=spartan">change c</a></th> | |
| 540 | </tr> |
|
540 | </tr> | |
| 541 | <tr> |
|
541 | <tr> | |
| 542 | <th class="revision">revision 1:</td> |
|
542 | <th class="revision">revision 1:</td> | |
| 543 | <td class="node"> |
|
543 | <td class="node"> | |
| 544 |
<a href="/file/ |
|
544 | <a href="/file/b7682196df1c/c?style=spartan">b7682196df1c</a> | |
| 545 |
<a href="/diff/ |
|
545 | <a href="/diff/b7682196df1c/c?style=spartan">(diff)</a> | |
| 546 |
<a href="/annotate/ |
|
546 | <a href="/annotate/b7682196df1c/c?style=spartan">(annotate)</a> | |
| 547 | </td> |
|
547 | </td> | |
| 548 | </tr> |
|
548 | </tr> | |
| 549 |
|
549 | |||
| 550 | <tr> |
|
550 | <tr> | |
| 551 | <th class="author">author:</th> |
|
551 | <th class="author">author:</th> | |
| 552 | <td class="author">test</td> |
|
552 | <td class="author">test</td> | |
| 553 | </tr> |
|
553 | </tr> | |
| 554 | <tr> |
|
554 | <tr> | |
| 555 | <th class="date">date:</th> |
|
555 | <th class="date">date:</th> | |
| 556 | <td class="date">Thu Jan 01 00:00:00 1970 +0000</td> |
|
556 | <td class="date">Thu Jan 01 00:00:00 1970 +0000</td> | |
| 557 | </tr> |
|
557 | </tr> | |
| 558 | </table> |
|
558 | </table> | |
| 559 |
|
559 | |||
| 560 |
|
560 | |||
| 561 | <table class="logEntry parity1"> |
|
561 | <table class="logEntry parity1"> | |
| 562 | <tr> |
|
562 | <tr> | |
| 563 | <th class="age">1970-01-01:</th> |
|
563 | <th class="age">1970-01-01:</th> | |
| 564 |
<th class="firstline"><a href="/rev/ |
|
564 | <th class="firstline"><a href="/rev/1a6696706df2?style=spartan">mv b</a></th> | |
| 565 | </tr> |
|
565 | </tr> | |
| 566 | <tr> |
|
566 | <tr> | |
| 567 | <th class="revision">revision 0:</td> |
|
567 | <th class="revision">revision 0:</td> | |
| 568 | <td class="node"> |
|
568 | <td class="node"> | |
| 569 |
<a href="/file/ |
|
569 | <a href="/file/1a6696706df2/c?style=spartan">1a6696706df2</a> | |
| 570 |
<a href="/diff/ |
|
570 | <a href="/diff/1a6696706df2/c?style=spartan">(diff)</a> | |
| 571 |
<a href="/annotate/ |
|
571 | <a href="/annotate/1a6696706df2/c?style=spartan">(annotate)</a> | |
| 572 | </td> |
|
572 | </td> | |
| 573 | </tr> |
|
573 | </tr> | |
| 574 |
|
574 | |||
| 575 | <tr> |
|
575 | <tr> | |
| 576 | <th>base:</th> |
|
576 | <th>base:</th> | |
| 577 | <td> |
|
577 | <td> | |
| 578 | <a href="/file/1e88685f5dde/b?style=spartan"> |
|
578 | <a href="/file/1e88685f5dde/b?style=spartan"> | |
| 579 | b@1e88685f5dde |
|
579 | b@1e88685f5dde | |
| 580 | </a> |
|
580 | </a> | |
| 581 | </td> |
|
581 | </td> | |
| 582 | </tr> |
|
582 | </tr> | |
| 583 | <tr> |
|
583 | <tr> | |
| 584 | <th class="author">author:</th> |
|
584 | <th class="author">author:</th> | |
| 585 | <td class="author">test</td> |
|
585 | <td class="author">test</td> | |
| 586 | </tr> |
|
586 | </tr> | |
| 587 | <tr> |
|
587 | <tr> | |
| 588 | <th class="date">date:</th> |
|
588 | <th class="date">date:</th> | |
| 589 | <td class="date">Thu Jan 01 00:00:00 1970 +0000</td> |
|
589 | <td class="date">Thu Jan 01 00:00:00 1970 +0000</td> | |
| 590 | </tr> |
|
590 | </tr> | |
| 591 | </table> |
|
591 | </table> | |
| 592 |
|
592 | |||
| 593 |
|
593 | |||
| 594 |
|
594 | |||
| 595 |
|
595 | |||
| 596 |
|
596 | |||
| 597 | <div class="logo"> |
|
597 | <div class="logo"> | |
| 598 | <a href="http://mercurial.selenic.com/"> |
|
598 | <a href="http://mercurial.selenic.com/"> | |
| 599 | <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> |
|
599 | <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> | |
| 600 | </div> |
|
600 | </div> | |
| 601 |
|
601 | |||
| 602 | </body> |
|
602 | </body> | |
| 603 | </html> |
|
603 | </html> | |
| 604 |
|
604 | |||
| 605 | % errors |
|
605 | % errors | |
| @@ -1,193 +1,193 b'' | |||||
| 1 | # creating 'remote' |
|
1 | # creating 'remote' | |
| 2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 3 | created new head |
|
3 | created new head | |
| 4 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 5 | rev offset length base linkrev nodeid p1 p2 |
|
5 | rev offset length base linkrev nodeid p1 p2 | |
| 6 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
|
6 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 | |
| 7 | 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 |
|
7 | 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 | |
| 8 | 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 |
|
8 | 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 | |
| 9 | 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 |
|
9 | 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 | |
| 10 | rev offset length base linkrev nodeid p1 p2 |
|
10 | rev offset length base linkrev nodeid p1 p2 | |
| 11 |
0 0 75 0 7 |
|
11 | 0 0 75 0 7 2565f3199a74 000000000000 000000000000 | |
| 12 | rev offset length base linkrev nodeid p1 p2 |
|
12 | rev offset length base linkrev nodeid p1 p2 | |
| 13 |
0 0 75 0 8 |
|
13 | 0 0 75 0 8 2565f3199a74 000000000000 000000000000 | |
| 14 | rev offset length base linkrev nodeid p1 p2 |
|
14 | rev offset length base linkrev nodeid p1 p2 | |
| 15 | 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 |
|
15 | 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 | |
| 16 | rev offset length base linkrev nodeid p1 p2 |
|
16 | rev offset length base linkrev nodeid p1 p2 | |
| 17 | 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 |
|
17 | 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 | |
| 18 | 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 |
|
18 | 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 | |
| 19 | 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 |
|
19 | 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 | |
| 20 | 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 |
|
20 | 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 | |
| 21 | 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 |
|
21 | 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 | |
| 22 |
5 250 68 3 7 |
|
22 | 5 250 68 3 7 09bb521d218d de68e904d169 000000000000 | |
| 23 |
6 318 54 6 8 |
|
23 | 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000 | |
| 24 | checking changesets |
|
24 | checking changesets | |
| 25 | checking manifests |
|
25 | checking manifests | |
| 26 | crosschecking files in changesets and manifests |
|
26 | crosschecking files in changesets and manifests | |
| 27 | checking files |
|
27 | checking files | |
| 28 | 4 files, 9 changesets, 7 total revisions |
|
28 | 4 files, 9 changesets, 7 total revisions | |
| 29 | # Starting server |
|
29 | # Starting server | |
| 30 | # clone remote via stream |
|
30 | # clone remote via stream | |
| 31 | requesting all changes |
|
31 | requesting all changes | |
| 32 | adding changesets |
|
32 | adding changesets | |
| 33 | adding manifests |
|
33 | adding manifests | |
| 34 | adding file changes |
|
34 | adding file changes | |
| 35 | added 1 changesets with 1 changes to 1 files |
|
35 | added 1 changesets with 1 changes to 1 files | |
| 36 | updating to branch default |
|
36 | updating to branch default | |
| 37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 38 | checking changesets |
|
38 | checking changesets | |
| 39 | checking manifests |
|
39 | checking manifests | |
| 40 | crosschecking files in changesets and manifests |
|
40 | crosschecking files in changesets and manifests | |
| 41 | checking files |
|
41 | checking files | |
| 42 | 1 files, 1 changesets, 1 total revisions |
|
42 | 1 files, 1 changesets, 1 total revisions | |
| 43 | requesting all changes |
|
43 | requesting all changes | |
| 44 | adding changesets |
|
44 | adding changesets | |
| 45 | adding manifests |
|
45 | adding manifests | |
| 46 | adding file changes |
|
46 | adding file changes | |
| 47 | added 2 changesets with 2 changes to 1 files |
|
47 | added 2 changesets with 2 changes to 1 files | |
| 48 | updating to branch default |
|
48 | updating to branch default | |
| 49 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 50 | checking changesets |
|
50 | checking changesets | |
| 51 | checking manifests |
|
51 | checking manifests | |
| 52 | crosschecking files in changesets and manifests |
|
52 | crosschecking files in changesets and manifests | |
| 53 | checking files |
|
53 | checking files | |
| 54 | 1 files, 2 changesets, 2 total revisions |
|
54 | 1 files, 2 changesets, 2 total revisions | |
| 55 | requesting all changes |
|
55 | requesting all changes | |
| 56 | adding changesets |
|
56 | adding changesets | |
| 57 | adding manifests |
|
57 | adding manifests | |
| 58 | adding file changes |
|
58 | adding file changes | |
| 59 | added 3 changesets with 3 changes to 1 files |
|
59 | added 3 changesets with 3 changes to 1 files | |
| 60 | updating to branch default |
|
60 | updating to branch default | |
| 61 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
61 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 62 | checking changesets |
|
62 | checking changesets | |
| 63 | checking manifests |
|
63 | checking manifests | |
| 64 | crosschecking files in changesets and manifests |
|
64 | crosschecking files in changesets and manifests | |
| 65 | checking files |
|
65 | checking files | |
| 66 | 1 files, 3 changesets, 3 total revisions |
|
66 | 1 files, 3 changesets, 3 total revisions | |
| 67 | requesting all changes |
|
67 | requesting all changes | |
| 68 | adding changesets |
|
68 | adding changesets | |
| 69 | adding manifests |
|
69 | adding manifests | |
| 70 | adding file changes |
|
70 | adding file changes | |
| 71 | added 4 changesets with 4 changes to 1 files |
|
71 | added 4 changesets with 4 changes to 1 files | |
| 72 | updating to branch default |
|
72 | updating to branch default | |
| 73 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
73 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 74 | checking changesets |
|
74 | checking changesets | |
| 75 | checking manifests |
|
75 | checking manifests | |
| 76 | crosschecking files in changesets and manifests |
|
76 | crosschecking files in changesets and manifests | |
| 77 | checking files |
|
77 | checking files | |
| 78 | 1 files, 4 changesets, 4 total revisions |
|
78 | 1 files, 4 changesets, 4 total revisions | |
| 79 | requesting all changes |
|
79 | requesting all changes | |
| 80 | adding changesets |
|
80 | adding changesets | |
| 81 | adding manifests |
|
81 | adding manifests | |
| 82 | adding file changes |
|
82 | adding file changes | |
| 83 | added 2 changesets with 2 changes to 1 files |
|
83 | added 2 changesets with 2 changes to 1 files | |
| 84 | updating to branch default |
|
84 | updating to branch default | |
| 85 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
85 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 86 | checking changesets |
|
86 | checking changesets | |
| 87 | checking manifests |
|
87 | checking manifests | |
| 88 | crosschecking files in changesets and manifests |
|
88 | crosschecking files in changesets and manifests | |
| 89 | checking files |
|
89 | checking files | |
| 90 | 1 files, 2 changesets, 2 total revisions |
|
90 | 1 files, 2 changesets, 2 total revisions | |
| 91 | requesting all changes |
|
91 | requesting all changes | |
| 92 | adding changesets |
|
92 | adding changesets | |
| 93 | adding manifests |
|
93 | adding manifests | |
| 94 | adding file changes |
|
94 | adding file changes | |
| 95 | added 3 changesets with 3 changes to 1 files |
|
95 | added 3 changesets with 3 changes to 1 files | |
| 96 | updating to branch default |
|
96 | updating to branch default | |
| 97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 98 | checking changesets |
|
98 | checking changesets | |
| 99 | checking manifests |
|
99 | checking manifests | |
| 100 | crosschecking files in changesets and manifests |
|
100 | crosschecking files in changesets and manifests | |
| 101 | checking files |
|
101 | checking files | |
| 102 | 1 files, 3 changesets, 3 total revisions |
|
102 | 1 files, 3 changesets, 3 total revisions | |
| 103 | requesting all changes |
|
103 | requesting all changes | |
| 104 | adding changesets |
|
104 | adding changesets | |
| 105 | adding manifests |
|
105 | adding manifests | |
| 106 | adding file changes |
|
106 | adding file changes | |
| 107 | added 4 changesets with 5 changes to 2 files |
|
107 | added 4 changesets with 5 changes to 2 files | |
| 108 | updating to branch default |
|
108 | updating to branch default | |
| 109 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
109 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 110 | checking changesets |
|
110 | checking changesets | |
| 111 | checking manifests |
|
111 | checking manifests | |
| 112 | crosschecking files in changesets and manifests |
|
112 | crosschecking files in changesets and manifests | |
| 113 | checking files |
|
113 | checking files | |
| 114 | 2 files, 4 changesets, 5 total revisions |
|
114 | 2 files, 4 changesets, 5 total revisions | |
| 115 | requesting all changes |
|
115 | requesting all changes | |
| 116 | adding changesets |
|
116 | adding changesets | |
| 117 | adding manifests |
|
117 | adding manifests | |
| 118 | adding file changes |
|
118 | adding file changes | |
| 119 | added 5 changesets with 6 changes to 3 files |
|
119 | added 5 changesets with 6 changes to 3 files | |
| 120 | updating to branch default |
|
120 | updating to branch default | |
| 121 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
121 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 122 | checking changesets |
|
122 | checking changesets | |
| 123 | checking manifests |
|
123 | checking manifests | |
| 124 | crosschecking files in changesets and manifests |
|
124 | crosschecking files in changesets and manifests | |
| 125 | checking files |
|
125 | checking files | |
| 126 | 3 files, 5 changesets, 6 total revisions |
|
126 | 3 files, 5 changesets, 6 total revisions | |
| 127 | requesting all changes |
|
127 | requesting all changes | |
| 128 | adding changesets |
|
128 | adding changesets | |
| 129 | adding manifests |
|
129 | adding manifests | |
| 130 | adding file changes |
|
130 | adding file changes | |
| 131 | added 5 changesets with 5 changes to 2 files |
|
131 | added 5 changesets with 5 changes to 2 files | |
| 132 | updating to branch default |
|
132 | updating to branch default | |
| 133 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
133 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 134 | checking changesets |
|
134 | checking changesets | |
| 135 | checking manifests |
|
135 | checking manifests | |
| 136 | crosschecking files in changesets and manifests |
|
136 | crosschecking files in changesets and manifests | |
| 137 | checking files |
|
137 | checking files | |
| 138 | 2 files, 5 changesets, 5 total revisions |
|
138 | 2 files, 5 changesets, 5 total revisions | |
| 139 | pulling from ../test-7 |
|
139 | pulling from ../test-7 | |
| 140 | searching for changes |
|
140 | searching for changes | |
| 141 | adding changesets |
|
141 | adding changesets | |
| 142 | adding manifests |
|
142 | adding manifests | |
| 143 | adding file changes |
|
143 | adding file changes | |
| 144 | added 4 changesets with 2 changes to 3 files (+1 heads) |
|
144 | added 4 changesets with 2 changes to 3 files (+1 heads) | |
| 145 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
145 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 146 | checking changesets |
|
146 | checking changesets | |
| 147 | checking manifests |
|
147 | checking manifests | |
| 148 | crosschecking files in changesets and manifests |
|
148 | crosschecking files in changesets and manifests | |
| 149 | checking files |
|
149 | checking files | |
| 150 | 4 files, 9 changesets, 7 total revisions |
|
150 | 4 files, 9 changesets, 7 total revisions | |
| 151 | pulling from http://localhost:$HGPORT/ |
|
151 | pulling from http://localhost:$HGPORT/ | |
| 152 | searching for changes |
|
152 | searching for changes | |
| 153 | adding changesets |
|
153 | adding changesets | |
| 154 | adding manifests |
|
154 | adding manifests | |
| 155 | adding file changes |
|
155 | adding file changes | |
| 156 | added 1 changesets with 0 changes to 1 files (+1 heads) |
|
156 | added 1 changesets with 0 changes to 1 files (+1 heads) | |
| 157 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
157 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 158 | checking changesets |
|
158 | checking changesets | |
| 159 | checking manifests |
|
159 | checking manifests | |
| 160 | crosschecking files in changesets and manifests |
|
160 | crosschecking files in changesets and manifests | |
| 161 | checking files |
|
161 | checking files | |
| 162 | 1 files, 3 changesets, 2 total revisions |
|
162 | 1 files, 3 changesets, 2 total revisions | |
| 163 | pulling from http://localhost:$HGPORT/ |
|
163 | pulling from http://localhost:$HGPORT/ | |
| 164 | searching for changes |
|
164 | searching for changes | |
| 165 | adding changesets |
|
165 | adding changesets | |
| 166 | adding manifests |
|
166 | adding manifests | |
| 167 | adding file changes |
|
167 | adding file changes | |
| 168 | added 6 changesets with 5 changes to 4 files |
|
168 | added 6 changesets with 5 changes to 4 files | |
| 169 | (run 'hg update' to get a working copy) |
|
169 | (run 'hg update' to get a working copy) | |
| 170 | pulling from http://localhost:$HGPORT/ |
|
170 | pulling from http://localhost:$HGPORT/ | |
| 171 | searching for changes |
|
171 | searching for changes | |
| 172 | adding changesets |
|
172 | adding changesets | |
| 173 | adding manifests |
|
173 | adding manifests | |
| 174 | adding file changes |
|
174 | adding file changes | |
| 175 | added 2 changesets with 0 changes to 1 files (+1 heads) |
|
175 | added 2 changesets with 0 changes to 1 files (+1 heads) | |
| 176 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
176 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 177 | checking changesets |
|
177 | checking changesets | |
| 178 | checking manifests |
|
178 | checking manifests | |
| 179 | crosschecking files in changesets and manifests |
|
179 | crosschecking files in changesets and manifests | |
| 180 | checking files |
|
180 | checking files | |
| 181 | 1 files, 5 changesets, 3 total revisions |
|
181 | 1 files, 5 changesets, 3 total revisions | |
| 182 | pulling from http://localhost:$HGPORT/ |
|
182 | pulling from http://localhost:$HGPORT/ | |
| 183 | searching for changes |
|
183 | searching for changes | |
| 184 | adding changesets |
|
184 | adding changesets | |
| 185 | adding manifests |
|
185 | adding manifests | |
| 186 | adding file changes |
|
186 | adding file changes | |
| 187 | added 4 changesets with 4 changes to 4 files |
|
187 | added 4 changesets with 4 changes to 4 files | |
| 188 | (run 'hg update' to get a working copy) |
|
188 | (run 'hg update' to get a working copy) | |
| 189 | checking changesets |
|
189 | checking changesets | |
| 190 | checking manifests |
|
190 | checking manifests | |
| 191 | crosschecking files in changesets and manifests |
|
191 | crosschecking files in changesets and manifests | |
| 192 | checking files |
|
192 | checking files | |
| 193 | 4 files, 9 changesets, 7 total revisions |
|
193 | 4 files, 9 changesets, 7 total revisions | |
| @@ -1,25 +1,25 b'' | |||||
| 1 | adding a |
|
1 | adding a | |
| 2 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 3 | warning: detected divergent renames of a to: |
|
3 | warning: detected divergent renames of a to: | |
| 4 | a2 |
|
4 | a2 | |
| 5 | a1 |
|
5 | a1 | |
| 6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 7 | adding a |
|
7 | adding a | |
| 8 | b |
|
8 | b | |
| 9 | b: searching for copy revision for a |
|
9 | b: searching for copy revision for a | |
| 10 | b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db |
|
10 | b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db | |
| 11 | committed changeset 5:755e75751bf67eb4378bca61987df035d90a7a06 |
|
11 | committed changeset 5:89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b | |
| 12 | checking changesets |
|
12 | checking changesets | |
| 13 | checking manifests |
|
13 | checking manifests | |
| 14 | crosschecking files in changesets and manifests |
|
14 | crosschecking files in changesets and manifests | |
| 15 | checking files |
|
15 | checking files | |
| 16 | 4 files, 6 changesets, 4 total revisions |
|
16 | 4 files, 6 changesets, 4 total revisions | |
| 17 | # HG changeset patch |
|
17 | # HG changeset patch | |
| 18 | # User test |
|
18 | # User test | |
| 19 | # Date 0 0 |
|
19 | # Date 0 0 | |
| 20 | # Node ID 755e75751bf67eb4378bca61987df035d90a7a06 |
|
20 | # Node ID 89e8e4be0de296fa3d6dd7825ccc44d7dc0f1f3b | |
| 21 | # Parent 7399822c2e395fe7d57c2fcf4b310f6fb22f8c2d |
|
21 | # Parent 7fc86ba705e717a721dbc361bf8c9bc05a18ca2f | |
| 22 | 5 |
|
22 | 5 | |
| 23 |
|
23 | |||
| 24 | diff --git a/b b/b |
|
24 | diff --git a/b b/b | |
| 25 | new file mode 100644 |
|
25 | new file mode 100644 | |
| @@ -1,62 +1,62 b'' | |||||
| 1 | adding 1 |
|
1 | adding 1 | |
| 2 | adding 2 |
|
2 | adding 2 | |
| 3 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 4 | created new head |
|
4 | created new head | |
| 5 | searching for copies back to rev 1 |
|
5 | searching for copies back to rev 1 | |
| 6 | unmatched files in other: |
|
6 | unmatched files in other: | |
| 7 | 1a |
|
7 | 1a | |
| 8 | all copies found (* = to merge, ! = divergent): |
|
8 | all copies found (* = to merge, ! = divergent): | |
| 9 | 1a -> 1 |
|
9 | 1a -> 1 | |
| 10 | checking for directory renames |
|
10 | checking for directory renames | |
| 11 | resolving manifests |
|
11 | resolving manifests | |
| 12 | overwrite None partial False |
|
12 | overwrite None partial False | |
| 13 |
ancestor 81f4b099af3d local c64f439569a9+ remote |
|
13 | ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a | |
| 14 | 1: other deleted -> r |
|
14 | 1: other deleted -> r | |
| 15 | 1a: remote created -> g |
|
15 | 1a: remote created -> g | |
| 16 | update: 1 1/2 files (50.00%) |
|
16 | update: 1 1/2 files (50.00%) | |
| 17 | removing 1 |
|
17 | removing 1 | |
| 18 | update: 1a 2/2 files (100.00%) |
|
18 | update: 1a 2/2 files (100.00%) | |
| 19 | getting 1a |
|
19 | getting 1a | |
| 20 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
20 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 21 | (branch merge, don't forget to commit) |
|
21 | (branch merge, don't forget to commit) | |
| 22 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
22 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 23 | created new head |
|
23 | created new head | |
| 24 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
24 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 25 | searching for copies back to rev 1 |
|
25 | searching for copies back to rev 1 | |
| 26 | unmatched files in local: |
|
26 | unmatched files in local: | |
| 27 | 1a |
|
27 | 1a | |
| 28 | all copies found (* = to merge, ! = divergent): |
|
28 | all copies found (* = to merge, ! = divergent): | |
| 29 | 1a -> 1 * |
|
29 | 1a -> 1 * | |
| 30 | checking for directory renames |
|
30 | checking for directory renames | |
| 31 | resolving manifests |
|
31 | resolving manifests | |
| 32 | overwrite None partial False |
|
32 | overwrite None partial False | |
| 33 |
ancestor c64f439569a9 local |
|
33 | ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96 | |
| 34 | 1a: local copied/moved to 1 -> m |
|
34 | 1a: local copied/moved to 1 -> m | |
| 35 | preserving 1a for resolve of 1a |
|
35 | preserving 1a for resolve of 1a | |
| 36 | update: 1a 1/1 files (100.00%) |
|
36 | update: 1a 1/1 files (100.00%) | |
| 37 | picked tool 'internal:merge' for 1a (binary False symlink False) |
|
37 | picked tool 'internal:merge' for 1a (binary False symlink False) | |
| 38 | merging 1a and 1 to 1a |
|
38 | merging 1a and 1 to 1a | |
| 39 |
my 1a@ |
|
39 | my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d | |
| 40 | premerge successful |
|
40 | premerge successful | |
| 41 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
41 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 42 | (branch merge, don't forget to commit) |
|
42 | (branch merge, don't forget to commit) | |
| 43 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
43 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 44 | searching for copies back to rev 1 |
|
44 | searching for copies back to rev 1 | |
| 45 | unmatched files in other: |
|
45 | unmatched files in other: | |
| 46 | 1a |
|
46 | 1a | |
| 47 | all copies found (* = to merge, ! = divergent): |
|
47 | all copies found (* = to merge, ! = divergent): | |
| 48 | 1a -> 1 * |
|
48 | 1a -> 1 * | |
| 49 | checking for directory renames |
|
49 | checking for directory renames | |
| 50 | resolving manifests |
|
50 | resolving manifests | |
| 51 | overwrite None partial False |
|
51 | overwrite None partial False | |
| 52 |
ancestor c64f439569a9 local 746e9549ea96+ remote |
|
52 | ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8 | |
| 53 | 1: remote moved to 1a -> m |
|
53 | 1: remote moved to 1a -> m | |
| 54 | preserving 1 for resolve of 1a |
|
54 | preserving 1 for resolve of 1a | |
| 55 | removing 1 |
|
55 | removing 1 | |
| 56 | update: 1 1/1 files (100.00%) |
|
56 | update: 1 1/1 files (100.00%) | |
| 57 | picked tool 'internal:merge' for 1a (binary False symlink False) |
|
57 | picked tool 'internal:merge' for 1a (binary False symlink False) | |
| 58 | merging 1 and 1a to 1a |
|
58 | merging 1 and 1a to 1a | |
| 59 |
my 1a@746e9549ea96+ other 1a@ |
|
59 | my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d | |
| 60 | premerge successful |
|
60 | premerge successful | |
| 61 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
61 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 62 | (branch merge, don't forget to commit) |
|
62 | (branch merge, don't forget to commit) | |
| @@ -1,480 +1,480 b'' | |||||
| 1 | % hg kwdemo |
|
1 | % hg kwdemo | |
| 2 | [extensions] |
|
2 | [extensions] | |
| 3 | keyword = |
|
3 | keyword = | |
| 4 | [keyword] |
|
4 | [keyword] | |
| 5 | demo.txt = |
|
5 | demo.txt = | |
| 6 | [keywordmaps] |
|
6 | [keywordmaps] | |
| 7 | Author = {author|user} |
|
7 | Author = {author|user} | |
| 8 | Date = {date|utcdate} |
|
8 | Date = {date|utcdate} | |
| 9 | Header = {root}/{file},v {node|short} {date|utcdate} {author|user} |
|
9 | Header = {root}/{file},v {node|short} {date|utcdate} {author|user} | |
| 10 | Id = {file|basename},v {node|short} {date|utcdate} {author|user} |
|
10 | Id = {file|basename},v {node|short} {date|utcdate} {author|user} | |
| 11 | RCSFile = {file|basename},v |
|
11 | RCSFile = {file|basename},v | |
| 12 | RCSfile = {file|basename},v |
|
12 | RCSfile = {file|basename},v | |
| 13 | Revision = {node|short} |
|
13 | Revision = {node|short} | |
| 14 | Source = {root}/{file},v |
|
14 | Source = {root}/{file},v | |
| 15 | $Author: test $ |
|
15 | $Author: test $ | |
| 16 | $Date: 2000/00/00 00:00:00 $ |
|
16 | $Date: 2000/00/00 00:00:00 $ | |
| 17 | $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ |
|
17 | $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ | |
| 18 | $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ |
|
18 | $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ | |
| 19 | $RCSFile: demo.txt,v $ |
|
19 | $RCSFile: demo.txt,v $ | |
| 20 | $RCSfile: demo.txt,v $ |
|
20 | $RCSfile: demo.txt,v $ | |
| 21 | $Revision: xxxxxxxxxxxx $ |
|
21 | $Revision: xxxxxxxxxxxx $ | |
| 22 | $Source: /TMP/demo.txt,v $ |
|
22 | $Source: /TMP/demo.txt,v $ | |
| 23 | [extensions] |
|
23 | [extensions] | |
| 24 | keyword = |
|
24 | keyword = | |
| 25 | [keyword] |
|
25 | [keyword] | |
| 26 | demo.txt = |
|
26 | demo.txt = | |
| 27 | [keywordmaps] |
|
27 | [keywordmaps] | |
| 28 | Branch = {branches} |
|
28 | Branch = {branches} | |
| 29 | $Branch: demobranch $ |
|
29 | $Branch: demobranch $ | |
| 30 | % kwshrink should exit silently in empty/invalid repo |
|
30 | % kwshrink should exit silently in empty/invalid repo | |
| 31 | pulling from test-keyword.hg |
|
31 | pulling from test-keyword.hg | |
| 32 | requesting all changes |
|
32 | requesting all changes | |
| 33 | adding changesets |
|
33 | adding changesets | |
| 34 | adding manifests |
|
34 | adding manifests | |
| 35 | adding file changes |
|
35 | adding file changes | |
| 36 | added 1 changesets with 1 changes to 1 files |
|
36 | added 1 changesets with 1 changes to 1 files | |
| 37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
37 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 38 | % cat |
|
38 | % cat | |
| 39 | expand $Id$ |
|
39 | expand $Id$ | |
| 40 | do not process $Id: |
|
40 | do not process $Id: | |
| 41 | xxx $ |
|
41 | xxx $ | |
| 42 | ignore $Id$ |
|
42 | ignore $Id$ | |
| 43 | % no kwfiles |
|
43 | % no kwfiles | |
| 44 | % untracked candidates |
|
44 | % untracked candidates | |
| 45 | k a |
|
45 | k a | |
| 46 | % addremove |
|
46 | % addremove | |
| 47 | adding a |
|
47 | adding a | |
| 48 | adding b |
|
48 | adding b | |
| 49 | % status |
|
49 | % status | |
| 50 | A a |
|
50 | A a | |
| 51 | A b |
|
51 | A b | |
| 52 | % default keyword expansion including commit hook |
|
52 | % default keyword expansion including commit hook | |
| 53 | % interrupted commit should not change state or run commit hook |
|
53 | % interrupted commit should not change state or run commit hook | |
| 54 | abort: empty commit message |
|
54 | abort: empty commit message | |
| 55 | % status |
|
55 | % status | |
| 56 | A a |
|
56 | A a | |
| 57 | A b |
|
57 | A b | |
| 58 | % commit |
|
58 | % commit | |
| 59 | a |
|
59 | a | |
| 60 | b |
|
60 | b | |
| 61 | overwriting a expanding keywords |
|
61 | overwriting a expanding keywords | |
| 62 | running hook commit.test: cp a hooktest |
|
62 | running hook commit.test: cp a hooktest | |
| 63 | committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
|
63 | committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 | |
| 64 | % status |
|
64 | % status | |
| 65 | ? hooktest |
|
65 | ? hooktest | |
| 66 | % identify |
|
66 | % identify | |
| 67 | ef63ca68695b |
|
67 | ef63ca68695b | |
| 68 | % cat |
|
68 | % cat | |
| 69 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
69 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | |
| 70 | do not process $Id: |
|
70 | do not process $Id: | |
| 71 | xxx $ |
|
71 | xxx $ | |
| 72 | ignore $Id$ |
|
72 | ignore $Id$ | |
| 73 | % hg cat |
|
73 | % hg cat | |
| 74 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
74 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | |
| 75 | do not process $Id: |
|
75 | do not process $Id: | |
| 76 | xxx $ |
|
76 | xxx $ | |
| 77 | ignore $Id$ |
|
77 | ignore $Id$ | |
| 78 | a |
|
78 | a | |
| 79 | % diff a hooktest |
|
79 | % diff a hooktest | |
| 80 | % removing commit hook from config |
|
80 | % removing commit hook from config | |
| 81 | % bundle |
|
81 | % bundle | |
| 82 | 2 changesets found |
|
82 | 2 changesets found | |
| 83 | % notify on pull to check whether keywords stay as is in email |
|
83 | % notify on pull to check whether keywords stay as is in email | |
| 84 | % ie. if patch.diff wrapper acts as it should |
|
84 | % ie. if patch.diff wrapper acts as it should | |
| 85 | % pull from bundle |
|
85 | % pull from bundle | |
| 86 | pulling from ../kw.hg |
|
86 | pulling from ../kw.hg | |
| 87 | requesting all changes |
|
87 | requesting all changes | |
| 88 | adding changesets |
|
88 | adding changesets | |
| 89 | adding manifests |
|
89 | adding manifests | |
| 90 | adding file changes |
|
90 | adding file changes | |
| 91 | added 2 changesets with 3 changes to 3 files |
|
91 | added 2 changesets with 3 changes to 3 files | |
| 92 |
|
92 | |||
| 93 | diff -r 000000000000 -r a2392c293916 sym |
|
93 | diff -r 000000000000 -r a2392c293916 sym | |
| 94 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
94 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 95 | +++ b/sym Sat Feb 09 20:25:47 2008 +0100 |
|
95 | +++ b/sym Sat Feb 09 20:25:47 2008 +0100 | |
| 96 | @@ -0,0 +1,1 @@ |
|
96 | @@ -0,0 +1,1 @@ | |
| 97 | +a |
|
97 | +a | |
| 98 | \ No newline at end of file |
|
98 | \ No newline at end of file | |
| 99 |
|
99 | |||
| 100 | diff -r a2392c293916 -r ef63ca68695b a |
|
100 | diff -r a2392c293916 -r ef63ca68695b a | |
| 101 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
101 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 102 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
102 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
| 103 | @@ -0,0 +1,3 @@ |
|
103 | @@ -0,0 +1,3 @@ | |
| 104 | +expand $Id$ |
|
104 | +expand $Id$ | |
| 105 | +do not process $Id: |
|
105 | +do not process $Id: | |
| 106 | +xxx $ |
|
106 | +xxx $ | |
| 107 | diff -r a2392c293916 -r ef63ca68695b b |
|
107 | diff -r a2392c293916 -r ef63ca68695b b | |
| 108 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
108 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 109 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
|
109 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |
| 110 | @@ -0,0 +1,1 @@ |
|
110 | @@ -0,0 +1,1 @@ | |
| 111 | +ignore $Id$ |
|
111 | +ignore $Id$ | |
| 112 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
112 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 113 | % remove notify config |
|
113 | % remove notify config | |
| 114 | % touch |
|
114 | % touch | |
| 115 | % status |
|
115 | % status | |
| 116 | % update |
|
116 | % update | |
| 117 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
117 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 118 | % cat |
|
118 | % cat | |
| 119 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
119 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | |
| 120 | do not process $Id: |
|
120 | do not process $Id: | |
| 121 | xxx $ |
|
121 | xxx $ | |
| 122 | ignore $Id$ |
|
122 | ignore $Id$ | |
| 123 | % check whether expansion is filewise |
|
123 | % check whether expansion is filewise | |
| 124 | % commit c |
|
124 | % commit c | |
| 125 | adding c |
|
125 | adding c | |
| 126 | % force expansion |
|
126 | % force expansion | |
| 127 | overwriting a expanding keywords |
|
127 | overwriting a expanding keywords | |
| 128 | overwriting c expanding keywords |
|
128 | overwriting c expanding keywords | |
| 129 | % compare changenodes in a c |
|
129 | % compare changenodes in a c | |
| 130 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
130 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | |
| 131 | do not process $Id: |
|
131 | do not process $Id: | |
| 132 | xxx $ |
|
132 | xxx $ | |
| 133 | $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
|
133 | $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ | |
| 134 | tests for different changenodes |
|
134 | tests for different changenodes | |
| 135 | % qinit -c |
|
135 | % qinit -c | |
| 136 | % qimport |
|
136 | % qimport | |
| 137 | % qcommit |
|
137 | % qcommit | |
| 138 | % keywords should not be expanded in patch |
|
138 | % keywords should not be expanded in patch | |
| 139 | # HG changeset patch |
|
139 | # HG changeset patch | |
| 140 | # User User Name <user@example.com> |
|
140 | # User User Name <user@example.com> | |
| 141 | # Date 1 0 |
|
141 | # Date 1 0 | |
| 142 | # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
|
142 | # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad | |
| 143 | # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
|
143 | # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 | |
| 144 | cndiff |
|
144 | cndiff | |
| 145 |
|
145 | |||
| 146 | diff -r ef63ca68695b -r 40a904bbbe4c c |
|
146 | diff -r ef63ca68695b -r 40a904bbbe4c c | |
| 147 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
147 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 148 | +++ b/c Thu Jan 01 00:00:01 1970 +0000 |
|
148 | +++ b/c Thu Jan 01 00:00:01 1970 +0000 | |
| 149 | @@ -0,0 +1,2 @@ |
|
149 | @@ -0,0 +1,2 @@ | |
| 150 | +$Id$ |
|
150 | +$Id$ | |
| 151 | +tests for different changenodes |
|
151 | +tests for different changenodes | |
| 152 | % qpop |
|
152 | % qpop | |
| 153 | popping mqtest.diff |
|
153 | popping mqtest.diff | |
| 154 | patch queue now empty |
|
154 | patch queue now empty | |
| 155 | % qgoto - should imply qpush |
|
155 | % qgoto - should imply qpush | |
| 156 | applying mqtest.diff |
|
156 | applying mqtest.diff | |
| 157 | now at: mqtest.diff |
|
157 | now at: mqtest.diff | |
| 158 | % cat |
|
158 | % cat | |
| 159 | $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
|
159 | $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ | |
| 160 | tests for different changenodes |
|
160 | tests for different changenodes | |
| 161 | % qpop and move on |
|
161 | % qpop and move on | |
| 162 | popping mqtest.diff |
|
162 | popping mqtest.diff | |
| 163 | patch queue now empty |
|
163 | patch queue now empty | |
| 164 | % copy |
|
164 | % copy | |
| 165 | % kwfiles added |
|
165 | % kwfiles added | |
| 166 | a |
|
166 | a | |
| 167 | c |
|
167 | c | |
| 168 | % commit |
|
168 | % commit | |
| 169 | c |
|
169 | c | |
| 170 | c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
|
170 | c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 | |
| 171 | overwriting c expanding keywords |
|
171 | overwriting c expanding keywords | |
| 172 | committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f |
|
172 | committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d | |
| 173 | % cat a c |
|
173 | % cat a c | |
| 174 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
174 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | |
| 175 | do not process $Id: |
|
175 | do not process $Id: | |
| 176 | xxx $ |
|
176 | xxx $ | |
| 177 |
expand $Id: c,v |
|
177 | expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $ | |
| 178 | do not process $Id: |
|
178 | do not process $Id: | |
| 179 | xxx $ |
|
179 | xxx $ | |
| 180 | % touch copied c |
|
180 | % touch copied c | |
| 181 | % status |
|
181 | % status | |
| 182 | % kwfiles |
|
182 | % kwfiles | |
| 183 | a |
|
183 | a | |
| 184 | c |
|
184 | c | |
| 185 | % ignored files |
|
185 | % ignored files | |
| 186 | I b |
|
186 | I b | |
| 187 | I sym |
|
187 | I sym | |
| 188 | % all files |
|
188 | % all files | |
| 189 | K a |
|
189 | K a | |
| 190 | K c |
|
190 | K c | |
| 191 | I b |
|
191 | I b | |
| 192 | I sym |
|
192 | I sym | |
| 193 | % diff --rev |
|
193 | % diff --rev | |
| 194 | diff -r ef63ca68695b c |
|
194 | diff -r ef63ca68695b c | |
| 195 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
195 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 196 | @@ -0,0 +1,3 @@ |
|
196 | @@ -0,0 +1,3 @@ | |
| 197 | +expand $Id$ |
|
197 | +expand $Id$ | |
| 198 | +do not process $Id: |
|
198 | +do not process $Id: | |
| 199 | +xxx $ |
|
199 | +xxx $ | |
| 200 | % rollback |
|
200 | % rollback | |
| 201 | rolling back last transaction |
|
201 | rolling back last transaction | |
| 202 | % status |
|
202 | % status | |
| 203 | A c |
|
203 | A c | |
| 204 | % update -C |
|
204 | % update -C | |
| 205 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
205 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 206 | % custom keyword expansion |
|
206 | % custom keyword expansion | |
| 207 | % try with kwdemo |
|
207 | % try with kwdemo | |
| 208 | [extensions] |
|
208 | [extensions] | |
| 209 | keyword = |
|
209 | keyword = | |
| 210 | [keyword] |
|
210 | [keyword] | |
| 211 | * = |
|
211 | * = | |
| 212 | b = ignore |
|
212 | b = ignore | |
| 213 | demo.txt = |
|
213 | demo.txt = | |
| 214 | [keywordmaps] |
|
214 | [keywordmaps] | |
| 215 | Xinfo = {author}: {desc} |
|
215 | Xinfo = {author}: {desc} | |
| 216 | $Xinfo: test: hg keyword config and expansion example $ |
|
216 | $Xinfo: test: hg keyword config and expansion example $ | |
| 217 | % cat |
|
217 | % cat | |
| 218 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
|
218 | expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ | |
| 219 | do not process $Id: |
|
219 | do not process $Id: | |
| 220 | xxx $ |
|
220 | xxx $ | |
| 221 | ignore $Id$ |
|
221 | ignore $Id$ | |
| 222 | % hg cat |
|
222 | % hg cat | |
| 223 | expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
|
223 | expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ | |
| 224 | do not process $Id: |
|
224 | do not process $Id: | |
| 225 | xxx $ |
|
225 | xxx $ | |
| 226 | ignore $Id$ |
|
226 | ignore $Id$ | |
| 227 | a |
|
227 | a | |
| 228 | % interrupted commit should not change state |
|
228 | % interrupted commit should not change state | |
| 229 | abort: empty commit message |
|
229 | abort: empty commit message | |
| 230 | % status |
|
230 | % status | |
| 231 | M a |
|
231 | M a | |
| 232 | ? c |
|
232 | ? c | |
| 233 | ? log |
|
233 | ? log | |
| 234 | % commit |
|
234 | % commit | |
| 235 | a |
|
235 | a | |
| 236 | overwriting a expanding keywords |
|
236 | overwriting a expanding keywords | |
| 237 | committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
|
237 | committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 | |
| 238 | % status |
|
238 | % status | |
| 239 | ? c |
|
239 | ? c | |
| 240 | % verify |
|
240 | % verify | |
| 241 | checking changesets |
|
241 | checking changesets | |
| 242 | checking manifests |
|
242 | checking manifests | |
| 243 | crosschecking files in changesets and manifests |
|
243 | crosschecking files in changesets and manifests | |
| 244 | checking files |
|
244 | checking files | |
| 245 | 3 files, 3 changesets, 4 total revisions |
|
245 | 3 files, 3 changesets, 4 total revisions | |
| 246 | % cat |
|
246 | % cat | |
| 247 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
|
247 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ | |
| 248 | do not process $Id: |
|
248 | do not process $Id: | |
| 249 | xxx $ |
|
249 | xxx $ | |
| 250 | $Xinfo: User Name <user@example.com>: firstline $ |
|
250 | $Xinfo: User Name <user@example.com>: firstline $ | |
| 251 | ignore $Id$ |
|
251 | ignore $Id$ | |
| 252 | % hg cat |
|
252 | % hg cat | |
| 253 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
|
253 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ | |
| 254 | do not process $Id: |
|
254 | do not process $Id: | |
| 255 | xxx $ |
|
255 | xxx $ | |
| 256 | $Xinfo: User Name <user@example.com>: firstline $ |
|
256 | $Xinfo: User Name <user@example.com>: firstline $ | |
| 257 | ignore $Id$ |
|
257 | ignore $Id$ | |
| 258 | a |
|
258 | a | |
| 259 | % annotate |
|
259 | % annotate | |
| 260 | 1: expand $Id$ |
|
260 | 1: expand $Id$ | |
| 261 | 1: do not process $Id: |
|
261 | 1: do not process $Id: | |
| 262 | 1: xxx $ |
|
262 | 1: xxx $ | |
| 263 | 2: $Xinfo$ |
|
263 | 2: $Xinfo$ | |
| 264 | % remove |
|
264 | % remove | |
| 265 | committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
|
265 | committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 | |
| 266 | % status |
|
266 | % status | |
| 267 | ? c |
|
267 | ? c | |
| 268 | % rollback |
|
268 | % rollback | |
| 269 | rolling back last transaction |
|
269 | rolling back last transaction | |
| 270 | % status |
|
270 | % status | |
| 271 | R a |
|
271 | R a | |
| 272 | ? c |
|
272 | ? c | |
| 273 | % revert a |
|
273 | % revert a | |
| 274 | % cat a |
|
274 | % cat a | |
| 275 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
|
275 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ | |
| 276 | do not process $Id: |
|
276 | do not process $Id: | |
| 277 | xxx $ |
|
277 | xxx $ | |
| 278 | $Xinfo: User Name <user@example.com>: firstline $ |
|
278 | $Xinfo: User Name <user@example.com>: firstline $ | |
| 279 | % clone to test incoming |
|
279 | % clone to test incoming | |
| 280 | requesting all changes |
|
280 | requesting all changes | |
| 281 | adding changesets |
|
281 | adding changesets | |
| 282 | adding manifests |
|
282 | adding manifests | |
| 283 | adding file changes |
|
283 | adding file changes | |
| 284 | added 2 changesets with 3 changes to 3 files |
|
284 | added 2 changesets with 3 changes to 3 files | |
| 285 | updating to branch default |
|
285 | updating to branch default | |
| 286 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
286 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 287 | % incoming |
|
287 | % incoming | |
| 288 | comparing with test-keyword/Test |
|
288 | comparing with test-keyword/Test | |
| 289 | searching for changes |
|
289 | searching for changes | |
| 290 | changeset: 2:bb948857c743 |
|
290 | changeset: 2:bb948857c743 | |
| 291 | tag: tip |
|
291 | tag: tip | |
| 292 | user: User Name <user@example.com> |
|
292 | user: User Name <user@example.com> | |
| 293 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
293 | date: Thu Jan 01 00:00:02 1970 +0000 | |
| 294 | summary: firstline |
|
294 | summary: firstline | |
| 295 |
|
295 | |||
| 296 | % commit rejecttest |
|
296 | % commit rejecttest | |
| 297 | a |
|
297 | a | |
| 298 | overwriting a expanding keywords |
|
298 | overwriting a expanding keywords | |
| 299 | committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
|
299 | committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 | |
| 300 | % export |
|
300 | % export | |
| 301 | % import |
|
301 | % import | |
| 302 | applying ../rejecttest.diff |
|
302 | applying ../rejecttest.diff | |
| 303 | % cat |
|
303 | % cat | |
| 304 | expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
|
304 | expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest | |
| 305 | do not process $Id: rejecttest |
|
305 | do not process $Id: rejecttest | |
| 306 | xxx $ |
|
306 | xxx $ | |
| 307 | $Xinfo: User Name <user@example.com>: rejects? $ |
|
307 | $Xinfo: User Name <user@example.com>: rejects? $ | |
| 308 | ignore $Id$ |
|
308 | ignore $Id$ | |
| 309 |
|
309 | |||
| 310 | % rollback |
|
310 | % rollback | |
| 311 | rolling back last transaction |
|
311 | rolling back last transaction | |
| 312 | % clean update |
|
312 | % clean update | |
| 313 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
313 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 314 | % kwexpand/kwshrink on selected files |
|
314 | % kwexpand/kwshrink on selected files | |
| 315 | % copy a x/a |
|
315 | % copy a x/a | |
| 316 | % kwexpand a |
|
316 | % kwexpand a | |
| 317 | overwriting a expanding keywords |
|
317 | overwriting a expanding keywords | |
| 318 | % kwexpand x/a should abort |
|
318 | % kwexpand x/a should abort | |
| 319 | abort: outstanding uncommitted changes |
|
319 | abort: outstanding uncommitted changes | |
| 320 | x/a |
|
320 | x/a | |
| 321 | x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
|
321 | x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e | |
| 322 | overwriting x/a expanding keywords |
|
322 | overwriting x/a expanding keywords | |
| 323 | committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e |
|
323 | committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 | |
| 324 | % cat a |
|
324 | % cat a | |
| 325 |
expand $Id: x/a |
|
325 | expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ | |
| 326 | do not process $Id: |
|
326 | do not process $Id: | |
| 327 | xxx $ |
|
327 | xxx $ | |
| 328 | $Xinfo: User Name <user@example.com>: xa $ |
|
328 | $Xinfo: User Name <user@example.com>: xa $ | |
| 329 | % kwshrink a inside directory x |
|
329 | % kwshrink a inside directory x | |
| 330 | overwriting x/a shrinking keywords |
|
330 | overwriting x/a shrinking keywords | |
| 331 | % cat a |
|
331 | % cat a | |
| 332 | expand $Id$ |
|
332 | expand $Id$ | |
| 333 | do not process $Id: |
|
333 | do not process $Id: | |
| 334 | xxx $ |
|
334 | xxx $ | |
| 335 | $Xinfo$ |
|
335 | $Xinfo$ | |
| 336 | % kwexpand nonexistent |
|
336 | % kwexpand nonexistent | |
| 337 | nonexistent: |
|
337 | nonexistent: | |
| 338 | % hg serve |
|
338 | % hg serve | |
| 339 | % expansion |
|
339 | % expansion | |
| 340 | % hgweb file |
|
340 | % hgweb file | |
| 341 | 200 Script output follows |
|
341 | 200 Script output follows | |
| 342 |
|
342 | |||
| 343 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
|
343 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ | |
| 344 | do not process $Id: |
|
344 | do not process $Id: | |
| 345 | xxx $ |
|
345 | xxx $ | |
| 346 | $Xinfo: User Name <user@example.com>: firstline $ |
|
346 | $Xinfo: User Name <user@example.com>: firstline $ | |
| 347 | % no expansion |
|
347 | % no expansion | |
| 348 | % hgweb annotate |
|
348 | % hgweb annotate | |
| 349 | 200 Script output follows |
|
349 | 200 Script output follows | |
| 350 |
|
350 | |||
| 351 |
|
351 | |||
| 352 | user@1: expand $Id$ |
|
352 | user@1: expand $Id$ | |
| 353 | user@1: do not process $Id: |
|
353 | user@1: do not process $Id: | |
| 354 | user@1: xxx $ |
|
354 | user@1: xxx $ | |
| 355 | user@2: $Xinfo$ |
|
355 | user@2: $Xinfo$ | |
| 356 |
|
356 | |||
| 357 |
|
357 | |||
| 358 |
|
358 | |||
| 359 |
|
359 | |||
| 360 | % hgweb changeset |
|
360 | % hgweb changeset | |
| 361 | 200 Script output follows |
|
361 | 200 Script output follows | |
| 362 |
|
362 | |||
| 363 |
|
363 | |||
| 364 | # HG changeset patch |
|
364 | # HG changeset patch | |
| 365 | # User User Name <user@example.com> |
|
365 | # User User Name <user@example.com> | |
| 366 | # Date 3 0 |
|
366 | # Date 3 0 | |
| 367 | # Node ID cfa68229c1167443337266ebac453c73b1d5d16e |
|
367 | # Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4 | |
| 368 | # Parent bb948857c743469b22bbf51f7ec8112279ca5d83 |
|
368 | # Parent bb948857c743469b22bbf51f7ec8112279ca5d83 | |
| 369 | xa |
|
369 | xa | |
| 370 |
|
370 | |||
| 371 |
diff -r bb948857c743 -r |
|
371 | diff -r bb948857c743 -r b4560182a3f9 x/a | |
| 372 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
372 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 373 | +++ b/x/a Thu Jan 01 00:00:03 1970 +0000 |
|
373 | +++ b/x/a Thu Jan 01 00:00:03 1970 +0000 | |
| 374 | @@ -0,0 +1,4 @@ |
|
374 | @@ -0,0 +1,4 @@ | |
| 375 | +expand $Id$ |
|
375 | +expand $Id$ | |
| 376 | +do not process $Id: |
|
376 | +do not process $Id: | |
| 377 | +xxx $ |
|
377 | +xxx $ | |
| 378 | +$Xinfo$ |
|
378 | +$Xinfo$ | |
| 379 |
|
379 | |||
| 380 | % hgweb filediff |
|
380 | % hgweb filediff | |
| 381 | 200 Script output follows |
|
381 | 200 Script output follows | |
| 382 |
|
382 | |||
| 383 |
|
383 | |||
| 384 | diff -r ef63ca68695b -r bb948857c743 a |
|
384 | diff -r ef63ca68695b -r bb948857c743 a | |
| 385 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
385 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
| 386 | +++ b/a Thu Jan 01 00:00:02 1970 +0000 |
|
386 | +++ b/a Thu Jan 01 00:00:02 1970 +0000 | |
| 387 | @@ -1,3 +1,4 @@ |
|
387 | @@ -1,3 +1,4 @@ | |
| 388 | expand $Id$ |
|
388 | expand $Id$ | |
| 389 | do not process $Id: |
|
389 | do not process $Id: | |
| 390 | xxx $ |
|
390 | xxx $ | |
| 391 | +$Xinfo$ |
|
391 | +$Xinfo$ | |
| 392 |
|
392 | |||
| 393 |
|
393 | |||
| 394 |
|
394 | |||
| 395 |
|
395 | |||
| 396 | % errors encountered |
|
396 | % errors encountered | |
| 397 | % merge/resolve |
|
397 | % merge/resolve | |
| 398 | % simplemerge |
|
398 | % simplemerge | |
| 399 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
399 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 400 | created new head |
|
400 | created new head | |
| 401 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
401 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 402 | (branch merge, don't forget to commit) |
|
402 | (branch merge, don't forget to commit) | |
| 403 |
$Id: m |
|
403 | $Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $ | |
| 404 | foo |
|
404 | foo | |
| 405 | % conflict |
|
405 | % conflict | |
| 406 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
406 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 407 | created new head |
|
407 | created new head | |
| 408 | merging m |
|
408 | merging m | |
| 409 | warning: conflicts during merge. |
|
409 | warning: conflicts during merge. | |
| 410 | merging m failed! |
|
410 | merging m failed! | |
| 411 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
411 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 412 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
412 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | |
| 413 | % keyword stays outside conflict zone |
|
413 | % keyword stays outside conflict zone | |
| 414 | $Id$ |
|
414 | $Id$ | |
| 415 | <<<<<<< local |
|
415 | <<<<<<< local | |
| 416 | bar |
|
416 | bar | |
| 417 | ======= |
|
417 | ======= | |
| 418 | foo |
|
418 | foo | |
| 419 | >>>>>>> other |
|
419 | >>>>>>> other | |
| 420 | % resolve to local |
|
420 | % resolve to local | |
| 421 |
$Id: m 4 |
|
421 | $Id: m 41efa6d38e9b Thu, 01 Jan 1970 00:00:00 +0000 test $ | |
| 422 | bar |
|
422 | bar | |
| 423 | % test restricted mode with transplant -b |
|
423 | % test restricted mode with transplant -b | |
| 424 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
424 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 425 | marked working directory as branch foo |
|
425 | marked working directory as branch foo | |
| 426 | created new head |
|
426 | created new head | |
| 427 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
427 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 428 |
applying |
|
428 | applying 4aa30d025d50 | |
| 429 | 1c4378f51c4d transplanted to 7d855abcab87 |
|
429 | 4aa30d025d50 transplanted to 5a4da427c162 | |
| 430 | % no expansion in changeset |
|
430 | % no expansion in changeset | |
| 431 |
changeset: 11: |
|
431 | changeset: 11:5a4da427c162 | |
| 432 | tag: tip |
|
432 | tag: tip | |
| 433 |
parent: 9:4 |
|
433 | parent: 9:41efa6d38e9b | |
| 434 | user: test |
|
434 | user: test | |
| 435 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
435 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 436 | summary: 9foobranch |
|
436 | summary: 9foobranch | |
| 437 |
|
437 | |||
| 438 | diff -r 43dfd2854b5b -r 7d855abcab87 a |
|
438 | diff -r 41efa6d38e9b -r 5a4da427c162 a | |
| 439 | --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
439 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
| 440 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
|
440 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
| 441 | @@ -1,3 +1,4 @@ |
|
441 | @@ -1,3 +1,4 @@ | |
| 442 | +foobranch |
|
442 | +foobranch | |
| 443 | expand $Id$ |
|
443 | expand $Id$ | |
| 444 | do not process $Id: |
|
444 | do not process $Id: | |
| 445 | xxx $ |
|
445 | xxx $ | |
| 446 |
|
446 | |||
| 447 | % expansion in file |
|
447 | % expansion in file | |
| 448 | foobranch |
|
448 | foobranch | |
| 449 |
expand $Id: a |
|
449 | expand $Id: a 5a4da427c162 Thu, 01 Jan 1970 00:00:00 +0000 test $ | |
| 450 | % switch off expansion |
|
450 | % switch off expansion | |
| 451 | % kwshrink with unknown file u |
|
451 | % kwshrink with unknown file u | |
| 452 | overwriting a shrinking keywords |
|
452 | overwriting a shrinking keywords | |
| 453 | overwriting m shrinking keywords |
|
453 | overwriting m shrinking keywords | |
| 454 | overwriting x/a shrinking keywords |
|
454 | overwriting x/a shrinking keywords | |
| 455 | % cat |
|
455 | % cat | |
| 456 | expand $Id$ |
|
456 | expand $Id$ | |
| 457 | do not process $Id: |
|
457 | do not process $Id: | |
| 458 | xxx $ |
|
458 | xxx $ | |
| 459 | $Xinfo$ |
|
459 | $Xinfo$ | |
| 460 | ignore $Id$ |
|
460 | ignore $Id$ | |
| 461 | % hg cat |
|
461 | % hg cat | |
| 462 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
|
462 | expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ | |
| 463 | do not process $Id: |
|
463 | do not process $Id: | |
| 464 | xxx $ |
|
464 | xxx $ | |
| 465 | $Xinfo: User Name <user@example.com>: firstline $ |
|
465 | $Xinfo: User Name <user@example.com>: firstline $ | |
| 466 | ignore $Id$ |
|
466 | ignore $Id$ | |
| 467 | a |
|
467 | a | |
| 468 | % cat |
|
468 | % cat | |
| 469 | expand $Id$ |
|
469 | expand $Id$ | |
| 470 | do not process $Id: |
|
470 | do not process $Id: | |
| 471 | xxx $ |
|
471 | xxx $ | |
| 472 | $Xinfo$ |
|
472 | $Xinfo$ | |
| 473 | ignore $Id$ |
|
473 | ignore $Id$ | |
| 474 | % hg cat |
|
474 | % hg cat | |
| 475 | expand $Id$ |
|
475 | expand $Id$ | |
| 476 | do not process $Id: |
|
476 | do not process $Id: | |
| 477 | xxx $ |
|
477 | xxx $ | |
| 478 | $Xinfo$ |
|
478 | $Xinfo$ | |
| 479 | ignore $Id$ |
|
479 | ignore $Id$ | |
| 480 | a |
|
480 | a | |
| @@ -1,278 +1,278 b'' | |||||
| 1 | adding a |
|
1 | adding a | |
| 2 | changeset: 0:8580ff50825a |
|
2 | changeset: 0:8580ff50825a | |
| 3 | user: test |
|
3 | user: test | |
| 4 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
4 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 5 | summary: a |
|
5 | summary: a | |
| 6 |
|
6 | |||
| 7 | % -f, directory |
|
7 | % -f, directory | |
| 8 | abort: cannot follow nonexistent file: "dir" |
|
8 | abort: cannot follow nonexistent file: "dir" | |
| 9 | % -f, but no args |
|
9 | % -f, but no args | |
| 10 |
changeset: 4: |
|
10 | changeset: 4:66c1345dc4f9 | |
| 11 | tag: tip |
|
11 | tag: tip | |
| 12 | user: test |
|
12 | user: test | |
| 13 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
13 | date: Thu Jan 01 00:00:05 1970 +0000 | |
| 14 | summary: e |
|
14 | summary: e | |
| 15 |
|
15 | |||
| 16 |
changeset: 3: |
|
16 | changeset: 3:7c6c671bb7cc | |
| 17 | user: test |
|
17 | user: test | |
| 18 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
18 | date: Thu Jan 01 00:00:04 1970 +0000 | |
| 19 | summary: d |
|
19 | summary: d | |
| 20 |
|
20 | |||
| 21 |
changeset: 2: |
|
21 | changeset: 2:41dd4284081e | |
| 22 | user: test |
|
22 | user: test | |
| 23 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
23 | date: Thu Jan 01 00:00:03 1970 +0000 | |
| 24 | summary: c |
|
24 | summary: c | |
| 25 |
|
25 | |||
| 26 |
changeset: 1: |
|
26 | changeset: 1:784de7cef101 | |
| 27 | user: test |
|
27 | user: test | |
| 28 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
28 | date: Thu Jan 01 00:00:02 1970 +0000 | |
| 29 | summary: b |
|
29 | summary: b | |
| 30 |
|
30 | |||
| 31 | changeset: 0:8580ff50825a |
|
31 | changeset: 0:8580ff50825a | |
| 32 | user: test |
|
32 | user: test | |
| 33 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
33 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 34 | summary: a |
|
34 | summary: a | |
| 35 |
|
35 | |||
| 36 | % one rename |
|
36 | % one rename | |
| 37 | changeset: 0:8580ff50825a |
|
37 | changeset: 0:8580ff50825a | |
| 38 | user: test |
|
38 | user: test | |
| 39 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
39 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 40 | files: a |
|
40 | files: a | |
| 41 | description: |
|
41 | description: | |
| 42 | a |
|
42 | a | |
| 43 |
|
43 | |||
| 44 |
|
44 | |||
| 45 | % many renames |
|
45 | % many renames | |
| 46 |
changeset: 4: |
|
46 | changeset: 4:66c1345dc4f9 | |
| 47 | tag: tip |
|
47 | tag: tip | |
| 48 | user: test |
|
48 | user: test | |
| 49 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
49 | date: Thu Jan 01 00:00:05 1970 +0000 | |
| 50 | files: dir/b e |
|
50 | files: dir/b e | |
| 51 | description: |
|
51 | description: | |
| 52 | e |
|
52 | e | |
| 53 |
|
53 | |||
| 54 |
|
54 | |||
| 55 |
changeset: 2: |
|
55 | changeset: 2:41dd4284081e | |
| 56 | user: test |
|
56 | user: test | |
| 57 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
57 | date: Thu Jan 01 00:00:03 1970 +0000 | |
| 58 | files: b dir/b |
|
58 | files: b dir/b | |
| 59 | description: |
|
59 | description: | |
| 60 | c |
|
60 | c | |
| 61 |
|
61 | |||
| 62 |
|
62 | |||
| 63 |
changeset: 1: |
|
63 | changeset: 1:784de7cef101 | |
| 64 | user: test |
|
64 | user: test | |
| 65 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
65 | date: Thu Jan 01 00:00:02 1970 +0000 | |
| 66 | files: b |
|
66 | files: b | |
| 67 | description: |
|
67 | description: | |
| 68 | b |
|
68 | b | |
| 69 |
|
69 | |||
| 70 |
|
70 | |||
| 71 | changeset: 0:8580ff50825a |
|
71 | changeset: 0:8580ff50825a | |
| 72 | user: test |
|
72 | user: test | |
| 73 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
73 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 74 | files: a |
|
74 | files: a | |
| 75 | description: |
|
75 | description: | |
| 76 | a |
|
76 | a | |
| 77 |
|
77 | |||
| 78 |
|
78 | |||
| 79 | % log copies with --copies |
|
79 | % log copies with --copies | |
| 80 | 4 e (dir/b) |
|
80 | 4 e (dir/b) | |
| 81 | 3 b (a) |
|
81 | 3 b (a) | |
| 82 | 2 dir/b (b) |
|
82 | 2 dir/b (b) | |
| 83 | 1 b (a) |
|
83 | 1 b (a) | |
| 84 | 0 |
|
84 | 0 | |
| 85 | % log copies switch without --copies, with old filecopy template |
|
85 | % log copies switch without --copies, with old filecopy template | |
| 86 | 4 |
|
86 | 4 | |
| 87 | 3 |
|
87 | 3 | |
| 88 | 2 |
|
88 | 2 | |
| 89 | 1 |
|
89 | 1 | |
| 90 | 0 |
|
90 | 0 | |
| 91 | % log copies switch with --copies |
|
91 | % log copies switch with --copies | |
| 92 | 4 e (dir/b) |
|
92 | 4 e (dir/b) | |
| 93 | 3 b (a) |
|
93 | 3 b (a) | |
| 94 | 2 dir/b (b) |
|
94 | 2 dir/b (b) | |
| 95 | 1 b (a) |
|
95 | 1 b (a) | |
| 96 | 0 |
|
96 | 0 | |
| 97 | % log copies, non-linear manifest |
|
97 | % log copies, non-linear manifest | |
| 98 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
98 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 99 | adding foo |
|
99 | adding foo | |
| 100 | created new head |
|
100 | created new head | |
| 101 | 5 e (dir/b) |
|
101 | 5 e (dir/b) | |
| 102 | % log copies, execute bit set |
|
102 | % log copies, execute bit set | |
| 103 | 6 |
|
103 | 6 | |
| 104 | % log -p d |
|
104 | % log -p d | |
| 105 |
changeset: 3: |
|
105 | changeset: 3:7c6c671bb7cc | |
| 106 | user: test |
|
106 | user: test | |
| 107 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
107 | date: Thu Jan 01 00:00:04 1970 +0000 | |
| 108 | files: a b d |
|
108 | files: a b d | |
| 109 | description: |
|
109 | description: | |
| 110 | d |
|
110 | d | |
| 111 |
|
111 | |||
| 112 |
|
112 | |||
| 113 | diff -r 21fba396af4c -r 16b60bf3f99a d |
|
113 | diff -r 41dd4284081e -r 7c6c671bb7cc d | |
| 114 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
114 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 115 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
115 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 | |
| 116 | @@ -0,0 +1,1 @@ |
|
116 | @@ -0,0 +1,1 @@ | |
| 117 | +a |
|
117 | +a | |
| 118 |
|
118 | |||
| 119 | adding base |
|
119 | adding base | |
| 120 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
120 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 121 | adding b1 |
|
121 | adding b1 | |
| 122 | created new head |
|
122 | created new head | |
| 123 | % log -f |
|
123 | % log -f | |
| 124 | changeset: 3:e62f78d544b4 |
|
124 | changeset: 3:e62f78d544b4 | |
| 125 | tag: tip |
|
125 | tag: tip | |
| 126 | parent: 1:3d5bf5654eda |
|
126 | parent: 1:3d5bf5654eda | |
| 127 | user: test |
|
127 | user: test | |
| 128 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
128 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 129 | summary: b1 |
|
129 | summary: b1 | |
| 130 |
|
130 | |||
| 131 | changeset: 1:3d5bf5654eda |
|
131 | changeset: 1:3d5bf5654eda | |
| 132 | user: test |
|
132 | user: test | |
| 133 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
133 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 134 | summary: r1 |
|
134 | summary: r1 | |
| 135 |
|
135 | |||
| 136 | changeset: 0:67e992f2c4f3 |
|
136 | changeset: 0:67e992f2c4f3 | |
| 137 | user: test |
|
137 | user: test | |
| 138 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
138 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 139 | summary: base |
|
139 | summary: base | |
| 140 |
|
140 | |||
| 141 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
141 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 142 | adding b2 |
|
142 | adding b2 | |
| 143 | created new head |
|
143 | created new head | |
| 144 | % log -f -r 1:tip |
|
144 | % log -f -r 1:tip | |
| 145 | changeset: 1:3d5bf5654eda |
|
145 | changeset: 1:3d5bf5654eda | |
| 146 | user: test |
|
146 | user: test | |
| 147 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
147 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 148 | summary: r1 |
|
148 | summary: r1 | |
| 149 |
|
149 | |||
| 150 | changeset: 2:60c670bf5b30 |
|
150 | changeset: 2:60c670bf5b30 | |
| 151 | user: test |
|
151 | user: test | |
| 152 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
152 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 153 | summary: r2 |
|
153 | summary: r2 | |
| 154 |
|
154 | |||
| 155 | changeset: 3:e62f78d544b4 |
|
155 | changeset: 3:e62f78d544b4 | |
| 156 | parent: 1:3d5bf5654eda |
|
156 | parent: 1:3d5bf5654eda | |
| 157 | user: test |
|
157 | user: test | |
| 158 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
158 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 159 | summary: b1 |
|
159 | summary: b1 | |
| 160 |
|
160 | |||
| 161 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
161 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 162 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
162 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 163 | (branch merge, don't forget to commit) |
|
163 | (branch merge, don't forget to commit) | |
| 164 | % log -r . with two parents |
|
164 | % log -r . with two parents | |
| 165 | changeset: 3:e62f78d544b4 |
|
165 | changeset: 3:e62f78d544b4 | |
| 166 | parent: 1:3d5bf5654eda |
|
166 | parent: 1:3d5bf5654eda | |
| 167 | user: test |
|
167 | user: test | |
| 168 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
168 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 169 | summary: b1 |
|
169 | summary: b1 | |
| 170 |
|
170 | |||
| 171 | % log -r . with one parent |
|
171 | % log -r . with one parent | |
| 172 | changeset: 5:302e9dd6890d |
|
172 | changeset: 5:302e9dd6890d | |
| 173 | tag: tip |
|
173 | tag: tip | |
| 174 | parent: 3:e62f78d544b4 |
|
174 | parent: 3:e62f78d544b4 | |
| 175 | parent: 4:ddb82e70d1a1 |
|
175 | parent: 4:ddb82e70d1a1 | |
| 176 | user: test |
|
176 | user: test | |
| 177 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
177 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 178 | summary: m12 |
|
178 | summary: m12 | |
| 179 |
|
179 | |||
| 180 | % log --follow-first |
|
180 | % log --follow-first | |
| 181 | changeset: 6:2404bbcab562 |
|
181 | changeset: 6:2404bbcab562 | |
| 182 | tag: tip |
|
182 | tag: tip | |
| 183 | user: test |
|
183 | user: test | |
| 184 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
184 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 185 | summary: b1.1 |
|
185 | summary: b1.1 | |
| 186 |
|
186 | |||
| 187 | changeset: 5:302e9dd6890d |
|
187 | changeset: 5:302e9dd6890d | |
| 188 | parent: 3:e62f78d544b4 |
|
188 | parent: 3:e62f78d544b4 | |
| 189 | parent: 4:ddb82e70d1a1 |
|
189 | parent: 4:ddb82e70d1a1 | |
| 190 | user: test |
|
190 | user: test | |
| 191 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
191 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 192 | summary: m12 |
|
192 | summary: m12 | |
| 193 |
|
193 | |||
| 194 | changeset: 3:e62f78d544b4 |
|
194 | changeset: 3:e62f78d544b4 | |
| 195 | parent: 1:3d5bf5654eda |
|
195 | parent: 1:3d5bf5654eda | |
| 196 | user: test |
|
196 | user: test | |
| 197 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
197 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 198 | summary: b1 |
|
198 | summary: b1 | |
| 199 |
|
199 | |||
| 200 | changeset: 1:3d5bf5654eda |
|
200 | changeset: 1:3d5bf5654eda | |
| 201 | user: test |
|
201 | user: test | |
| 202 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
202 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 203 | summary: r1 |
|
203 | summary: r1 | |
| 204 |
|
204 | |||
| 205 | changeset: 0:67e992f2c4f3 |
|
205 | changeset: 0:67e992f2c4f3 | |
| 206 | user: test |
|
206 | user: test | |
| 207 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
207 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 208 | summary: base |
|
208 | summary: base | |
| 209 |
|
209 | |||
| 210 | % log -P 2 |
|
210 | % log -P 2 | |
| 211 | changeset: 6:2404bbcab562 |
|
211 | changeset: 6:2404bbcab562 | |
| 212 | tag: tip |
|
212 | tag: tip | |
| 213 | user: test |
|
213 | user: test | |
| 214 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
214 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 215 | summary: b1.1 |
|
215 | summary: b1.1 | |
| 216 |
|
216 | |||
| 217 | changeset: 5:302e9dd6890d |
|
217 | changeset: 5:302e9dd6890d | |
| 218 | parent: 3:e62f78d544b4 |
|
218 | parent: 3:e62f78d544b4 | |
| 219 | parent: 4:ddb82e70d1a1 |
|
219 | parent: 4:ddb82e70d1a1 | |
| 220 | user: test |
|
220 | user: test | |
| 221 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
221 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 222 | summary: m12 |
|
222 | summary: m12 | |
| 223 |
|
223 | |||
| 224 | changeset: 4:ddb82e70d1a1 |
|
224 | changeset: 4:ddb82e70d1a1 | |
| 225 | parent: 0:67e992f2c4f3 |
|
225 | parent: 0:67e992f2c4f3 | |
| 226 | user: test |
|
226 | user: test | |
| 227 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
227 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 228 | summary: b2 |
|
228 | summary: b2 | |
| 229 |
|
229 | |||
| 230 | changeset: 3:e62f78d544b4 |
|
230 | changeset: 3:e62f78d544b4 | |
| 231 | parent: 1:3d5bf5654eda |
|
231 | parent: 1:3d5bf5654eda | |
| 232 | user: test |
|
232 | user: test | |
| 233 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
233 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 234 | summary: b1 |
|
234 | summary: b1 | |
| 235 |
|
235 | |||
| 236 | % log -r tip -p --git |
|
236 | % log -r tip -p --git | |
| 237 | changeset: 6:2404bbcab562 |
|
237 | changeset: 6:2404bbcab562 | |
| 238 | tag: tip |
|
238 | tag: tip | |
| 239 | user: test |
|
239 | user: test | |
| 240 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
240 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 241 | summary: b1.1 |
|
241 | summary: b1.1 | |
| 242 |
|
242 | |||
| 243 | diff --git a/b1 b/b1 |
|
243 | diff --git a/b1 b/b1 | |
| 244 | --- a/b1 |
|
244 | --- a/b1 | |
| 245 | +++ b/b1 |
|
245 | +++ b/b1 | |
| 246 | @@ -1,1 +1,2 @@ |
|
246 | @@ -1,1 +1,2 @@ | |
| 247 | b1 |
|
247 | b1 | |
| 248 | +postm |
|
248 | +postm | |
| 249 |
|
249 | |||
| 250 | % log -r "" |
|
250 | % log -r "" | |
| 251 | abort: 00changelog.i@: ambiguous identifier! |
|
251 | abort: 00changelog.i@: ambiguous identifier! | |
| 252 | % log -r <some unknown node id> |
|
252 | % log -r <some unknown node id> | |
| 253 | abort: unknown revision '1000000000000000000000000000000000000000'! |
|
253 | abort: unknown revision '1000000000000000000000000000000000000000'! | |
| 254 | % log -k r1 |
|
254 | % log -k r1 | |
| 255 | changeset: 1:3d5bf5654eda |
|
255 | changeset: 1:3d5bf5654eda | |
| 256 | user: test |
|
256 | user: test | |
| 257 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
257 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 258 | summary: r1 |
|
258 | summary: r1 | |
| 259 |
|
259 | |||
| 260 | % log -d -1 |
|
260 | % log -d -1 | |
| 261 | adding a |
|
261 | adding a | |
| 262 | adding b |
|
262 | adding b | |
| 263 | changeset: 0:29a4c94f1924 |
|
263 | changeset: 0:29a4c94f1924 | |
| 264 | user: User One <user1@example.org> |
|
264 | user: User One <user1@example.org> | |
| 265 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
265 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 266 | summary: a |
|
266 | summary: a | |
| 267 |
|
267 | |||
| 268 | changeset: 1:e834b5e69c0e |
|
268 | changeset: 1:e834b5e69c0e | |
| 269 | tag: tip |
|
269 | tag: tip | |
| 270 | user: User Two <user2@example.org> |
|
270 | user: User Two <user2@example.org> | |
| 271 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
271 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 272 | summary: b |
|
272 | summary: b | |
| 273 |
|
273 | |||
| 274 | changeset: 0:29a4c94f1924 |
|
274 | changeset: 0:29a4c94f1924 | |
| 275 | user: User One <user1@example.org> |
|
275 | user: User One <user1@example.org> | |
| 276 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
276 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 277 | summary: a |
|
277 | summary: a | |
| 278 |
|
278 | |||
| @@ -1,96 +1,96 b'' | |||||
| 1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 2 | created new head |
|
2 | created new head | |
| 3 | merging bar and foo to bar |
|
3 | merging bar and foo to bar | |
| 4 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
4 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 5 | (branch merge, don't forget to commit) |
|
5 | (branch merge, don't forget to commit) | |
| 6 | % contents of bar should be line0 line1 line2 |
|
6 | % contents of bar should be line0 line1 line2 | |
| 7 | line0 |
|
7 | line0 | |
| 8 | line1 |
|
8 | line1 | |
| 9 | line2 |
|
9 | line2 | |
| 10 | rev offset length base linkrev nodeid p1 p2 |
|
10 | rev offset length base linkrev nodeid p1 p2 | |
| 11 |
0 0 77 0 2 d |
|
11 | 0 0 77 0 2 d35118874825 000000000000 000000000000 | |
| 12 |
1 77 76 0 3 |
|
12 | 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 | |
| 13 | bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 |
|
13 | bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 | |
| 14 | rev offset length base linkrev nodeid p1 p2 |
|
14 | rev offset length base linkrev nodeid p1 p2 | |
| 15 | 0 0 7 0 0 690b295714ae 000000000000 000000000000 |
|
15 | 0 0 7 0 0 690b295714ae 000000000000 000000000000 | |
| 16 | 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 |
|
16 | 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 | |
| 17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 18 | created new head |
|
18 | created new head | |
| 19 | 4:2d2f9a22c82b 2:0a3ab4856510 |
|
19 | 4:2263c1be0967 2:0f2ff26688b9 | |
| 20 | 3:7d3b554bfdf1 2:0a3ab4856510 1:5cd961e4045d |
|
20 | 3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d | |
| 21 |
2:0 |
|
21 | 2:0f2ff26688b9 0:2665aaee66e9 | |
| 22 | 1:5cd961e4045d |
|
22 | 1:5cd961e4045d | |
| 23 | 0:2665aaee66e9 |
|
23 | 0:2665aaee66e9 | |
| 24 | % this should use bar@rev2 as the ancestor |
|
24 | % this should use bar@rev2 as the ancestor | |
| 25 | searching for copies back to rev 1 |
|
25 | searching for copies back to rev 1 | |
| 26 | resolving manifests |
|
26 | resolving manifests | |
| 27 | overwrite None partial False |
|
27 | overwrite None partial False | |
| 28 | ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1 |
|
28 | ancestor 0f2ff26688b9 local 2263c1be0967+ remote 0555950ead28 | |
| 29 | bar: versions differ -> m |
|
29 | bar: versions differ -> m | |
| 30 | preserving bar for resolve of bar |
|
30 | preserving bar for resolve of bar | |
| 31 | update: bar 1/1 files (100.00%) |
|
31 | update: bar 1/1 files (100.00%) | |
| 32 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
32 | picked tool 'internal:merge' for bar (binary False symlink False) | |
| 33 | merging bar |
|
33 | merging bar | |
| 34 | my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510 |
|
34 | my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 | |
| 35 | premerge successful |
|
35 | premerge successful | |
| 36 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
36 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 37 | (branch merge, don't forget to commit) |
|
37 | (branch merge, don't forget to commit) | |
| 38 | % contents of bar should be line1 line2 |
|
38 | % contents of bar should be line1 line2 | |
| 39 | line1 |
|
39 | line1 | |
| 40 | line2 |
|
40 | line2 | |
| 41 | rev offset length base linkrev nodeid p1 p2 |
|
41 | rev offset length base linkrev nodeid p1 p2 | |
| 42 |
0 0 77 0 2 d |
|
42 | 0 0 77 0 2 d35118874825 000000000000 000000000000 | |
| 43 |
1 77 76 0 3 |
|
43 | 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 | |
| 44 |
2 153 7 2 4 |
|
44 | 2 153 7 2 4 ff4b45017382 d35118874825 000000000000 | |
| 45 |
3 160 13 3 5 |
|
45 | 3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd | |
| 46 |
|
46 | |||
| 47 |
|
47 | |||
| 48 | requesting all changes |
|
48 | requesting all changes | |
| 49 | adding changesets |
|
49 | adding changesets | |
| 50 | adding manifests |
|
50 | adding manifests | |
| 51 | adding file changes |
|
51 | adding file changes | |
| 52 | added 3 changesets with 3 changes to 2 files (+1 heads) |
|
52 | added 3 changesets with 3 changes to 2 files (+1 heads) | |
| 53 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
53 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 54 | merging foo and bar to bar |
|
54 | merging foo and bar to bar | |
| 55 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
55 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 56 | (branch merge, don't forget to commit) |
|
56 | (branch merge, don't forget to commit) | |
| 57 | % contents of bar should be line0 line1 line2 |
|
57 | % contents of bar should be line0 line1 line2 | |
| 58 | line0 |
|
58 | line0 | |
| 59 | line1 |
|
59 | line1 | |
| 60 | line2 |
|
60 | line2 | |
| 61 | rev offset length base linkrev nodeid p1 p2 |
|
61 | rev offset length base linkrev nodeid p1 p2 | |
| 62 |
0 0 77 0 2 d |
|
62 | 0 0 77 0 2 d35118874825 000000000000 000000000000 | |
| 63 |
1 77 76 0 3 |
|
63 | 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 | |
| 64 | bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 |
|
64 | bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 | |
| 65 | rev offset length base linkrev nodeid p1 p2 |
|
65 | rev offset length base linkrev nodeid p1 p2 | |
| 66 | 0 0 7 0 0 690b295714ae 000000000000 000000000000 |
|
66 | 0 0 7 0 0 690b295714ae 000000000000 000000000000 | |
| 67 | 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 |
|
67 | 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 | |
| 68 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
68 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 69 | created new head |
|
69 | created new head | |
| 70 | 4:2d2f9a22c82b 2:0a3ab4856510 |
|
70 | 4:2263c1be0967 2:0f2ff26688b9 | |
| 71 | 3:96ab80c60897 1:5cd961e4045d 2:0a3ab4856510 |
|
71 | 3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9 | |
| 72 |
2:0 |
|
72 | 2:0f2ff26688b9 0:2665aaee66e9 | |
| 73 | 1:5cd961e4045d |
|
73 | 1:5cd961e4045d | |
| 74 | 0:2665aaee66e9 |
|
74 | 0:2665aaee66e9 | |
| 75 | % this should use bar@rev2 as the ancestor |
|
75 | % this should use bar@rev2 as the ancestor | |
| 76 | searching for copies back to rev 1 |
|
76 | searching for copies back to rev 1 | |
| 77 | resolving manifests |
|
77 | resolving manifests | |
| 78 | overwrite None partial False |
|
78 | overwrite None partial False | |
| 79 | ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897 |
|
79 | ancestor 0f2ff26688b9 local 2263c1be0967+ remote 3ffa6b9e35f0 | |
| 80 | bar: versions differ -> m |
|
80 | bar: versions differ -> m | |
| 81 | preserving bar for resolve of bar |
|
81 | preserving bar for resolve of bar | |
| 82 | update: bar 1/1 files (100.00%) |
|
82 | update: bar 1/1 files (100.00%) | |
| 83 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
83 | picked tool 'internal:merge' for bar (binary False symlink False) | |
| 84 | merging bar |
|
84 | merging bar | |
| 85 | my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510 |
|
85 | my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 | |
| 86 | premerge successful |
|
86 | premerge successful | |
| 87 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
87 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 88 | (branch merge, don't forget to commit) |
|
88 | (branch merge, don't forget to commit) | |
| 89 | % contents of bar should be line1 line2 |
|
89 | % contents of bar should be line1 line2 | |
| 90 | line1 |
|
90 | line1 | |
| 91 | line2 |
|
91 | line2 | |
| 92 | rev offset length base linkrev nodeid p1 p2 |
|
92 | rev offset length base linkrev nodeid p1 p2 | |
| 93 |
0 0 77 0 2 d |
|
93 | 0 0 77 0 2 d35118874825 000000000000 000000000000 | |
| 94 |
1 77 76 0 3 |
|
94 | 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 | |
| 95 |
2 153 7 2 4 |
|
95 | 2 153 7 2 4 ff4b45017382 d35118874825 000000000000 | |
| 96 |
3 160 13 3 5 |
|
96 | 3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd | |
| @@ -1,20 +1,20 b'' | |||||
| 1 | updating to branch default |
|
1 | updating to branch default | |
| 2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 3 | pulling from ../a |
|
3 | pulling from ../a | |
| 4 | searching for changes |
|
4 | searching for changes | |
| 5 | adding changesets |
|
5 | adding changesets | |
| 6 | adding manifests |
|
6 | adding manifests | |
| 7 | adding file changes |
|
7 | adding file changes | |
| 8 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
8 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 9 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
9 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 10 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 11 | merging testdir/subdir/a and testdir/a to testdir/subdir/a |
|
11 | merging testdir/subdir/a and testdir/a to testdir/subdir/a | |
| 12 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
12 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 13 | (branch merge, don't forget to commit) |
|
13 | (branch merge, don't forget to commit) | |
| 14 | M testdir/subdir/a |
|
14 | M testdir/subdir/a | |
| 15 |
diff -r |
|
15 | diff -r f7459795031e testdir/subdir/a | |
| 16 | --- a/testdir/subdir/a |
|
16 | --- a/testdir/subdir/a | |
| 17 | +++ b/testdir/subdir/a |
|
17 | +++ b/testdir/subdir/a | |
| 18 | @@ -1,1 +1,1 @@ |
|
18 | @@ -1,1 +1,1 @@ | |
| 19 | -a |
|
19 | -a | |
| 20 | +alpha |
|
20 | +alpha | |
| @@ -1,110 +1,110 b'' | |||||
| 1 | % git=auto: regular patch creation |
|
1 | % git=auto: regular patch creation | |
| 2 | # HG changeset patch |
|
2 | # HG changeset patch | |
| 3 | # Parent 0000000000000000000000000000000000000000 |
|
3 | # Parent 0000000000000000000000000000000000000000 | |
| 4 | # Date 0 0 |
|
4 | # Date 0 0 | |
| 5 |
|
5 | |||
| 6 | diff -r 000000000000 -r ef8dafc9fa4c a |
|
6 | diff -r 000000000000 -r ef8dafc9fa4c a | |
| 7 | --- /dev/null |
|
7 | --- /dev/null | |
| 8 | +++ b/a |
|
8 | +++ b/a | |
| 9 | @@ -0,0 +1,1 @@ |
|
9 | @@ -0,0 +1,1 @@ | |
| 10 | +a |
|
10 | +a | |
| 11 | % git=auto: git patch creation with copy |
|
11 | % git=auto: git patch creation with copy | |
| 12 | # HG changeset patch |
|
12 | # HG changeset patch | |
| 13 | # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 |
|
13 | # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 | |
| 14 | # Date 0 0 |
|
14 | # Date 0 0 | |
| 15 |
|
15 | |||
| 16 | diff --git a/a b/b |
|
16 | diff --git a/a b/b | |
| 17 | copy from a |
|
17 | copy from a | |
| 18 | copy to b |
|
18 | copy to b | |
| 19 | % git=auto: git patch when using --git |
|
19 | % git=auto: git patch when using --git | |
| 20 | # HG changeset patch |
|
20 | # HG changeset patch | |
| 21 | # Parent 2962f232b49d41ebc26c591ec8d556724be213ab |
|
21 | # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d | |
| 22 | # Date 0 0 |
|
22 | # Date 0 0 | |
| 23 |
|
23 | |||
| 24 | diff --git a/regular b/regular |
|
24 | diff --git a/regular b/regular | |
| 25 | new file mode 100644 |
|
25 | new file mode 100644 | |
| 26 | --- /dev/null |
|
26 | --- /dev/null | |
| 27 | +++ b/regular |
|
27 | +++ b/regular | |
| 28 | @@ -0,0 +1,1 @@ |
|
28 | @@ -0,0 +1,1 @@ | |
| 29 | +regular |
|
29 | +regular | |
| 30 | % git=auto: regular patch after qrefresh without --git |
|
30 | % git=auto: regular patch after qrefresh without --git | |
| 31 | # HG changeset patch |
|
31 | # HG changeset patch | |
| 32 | # Parent 2962f232b49d41ebc26c591ec8d556724be213ab |
|
32 | # Parent 99586d5f048c399e20f81cee41fbb3809c0e735d | |
| 33 | # Date 0 0 |
|
33 | # Date 0 0 | |
| 34 |
|
34 | |||
| 35 |
diff -r |
|
35 | diff -r 99586d5f048c regular | |
| 36 | --- /dev/null |
|
36 | --- /dev/null | |
| 37 | +++ b/regular |
|
37 | +++ b/regular | |
| 38 | @@ -0,0 +1,1 @@ |
|
38 | @@ -0,0 +1,1 @@ | |
| 39 | +regular |
|
39 | +regular | |
| 40 | % git=keep: git patch with --git |
|
40 | % git=keep: git patch with --git | |
| 41 | # HG changeset patch |
|
41 | # HG changeset patch | |
| 42 | # Parent 0000000000000000000000000000000000000000 |
|
42 | # Parent 0000000000000000000000000000000000000000 | |
| 43 | # Date 0 0 |
|
43 | # Date 0 0 | |
| 44 |
|
44 | |||
| 45 | diff --git a/a b/a |
|
45 | diff --git a/a b/a | |
| 46 | new file mode 100644 |
|
46 | new file mode 100644 | |
| 47 | --- /dev/null |
|
47 | --- /dev/null | |
| 48 | +++ b/a |
|
48 | +++ b/a | |
| 49 | @@ -0,0 +1,1 @@ |
|
49 | @@ -0,0 +1,1 @@ | |
| 50 | +a |
|
50 | +a | |
| 51 | % git=keep: git patch after qrefresh without --git |
|
51 | % git=keep: git patch after qrefresh without --git | |
| 52 | # HG changeset patch |
|
52 | # HG changeset patch | |
| 53 | # Parent 0000000000000000000000000000000000000000 |
|
53 | # Parent 0000000000000000000000000000000000000000 | |
| 54 | # Date 0 0 |
|
54 | # Date 0 0 | |
| 55 |
|
55 | |||
| 56 | diff --git a/a b/a |
|
56 | diff --git a/a b/a | |
| 57 | new file mode 100644 |
|
57 | new file mode 100644 | |
| 58 | --- /dev/null |
|
58 | --- /dev/null | |
| 59 | +++ b/a |
|
59 | +++ b/a | |
| 60 | @@ -0,0 +1,2 @@ |
|
60 | @@ -0,0 +1,2 @@ | |
| 61 | +a |
|
61 | +a | |
| 62 | +a |
|
62 | +a | |
| 63 | % git=yes: git patch |
|
63 | % git=yes: git patch | |
| 64 | # HG changeset patch |
|
64 | # HG changeset patch | |
| 65 | # Parent 0000000000000000000000000000000000000000 |
|
65 | # Parent 0000000000000000000000000000000000000000 | |
| 66 | # Date 0 0 |
|
66 | # Date 0 0 | |
| 67 |
|
67 | |||
| 68 | diff --git a/a b/a |
|
68 | diff --git a/a b/a | |
| 69 | new file mode 100644 |
|
69 | new file mode 100644 | |
| 70 | --- /dev/null |
|
70 | --- /dev/null | |
| 71 | +++ b/a |
|
71 | +++ b/a | |
| 72 | @@ -0,0 +1,1 @@ |
|
72 | @@ -0,0 +1,1 @@ | |
| 73 | +a |
|
73 | +a | |
| 74 | % git=yes: git patch after qrefresh |
|
74 | % git=yes: git patch after qrefresh | |
| 75 | # HG changeset patch |
|
75 | # HG changeset patch | |
| 76 | # Parent 0000000000000000000000000000000000000000 |
|
76 | # Parent 0000000000000000000000000000000000000000 | |
| 77 | # Date 0 0 |
|
77 | # Date 0 0 | |
| 78 |
|
78 | |||
| 79 | diff --git a/a b/a |
|
79 | diff --git a/a b/a | |
| 80 | new file mode 100644 |
|
80 | new file mode 100644 | |
| 81 | --- /dev/null |
|
81 | --- /dev/null | |
| 82 | +++ b/a |
|
82 | +++ b/a | |
| 83 | @@ -0,0 +1,2 @@ |
|
83 | @@ -0,0 +1,2 @@ | |
| 84 | +a |
|
84 | +a | |
| 85 | +a |
|
85 | +a | |
| 86 | % git=no: regular patch with copy |
|
86 | % git=no: regular patch with copy | |
| 87 | # HG changeset patch |
|
87 | # HG changeset patch | |
| 88 | # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 |
|
88 | # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 | |
| 89 | # Date 0 0 |
|
89 | # Date 0 0 | |
| 90 |
|
90 | |||
| 91 |
diff -r ef8dafc9fa4c -r |
|
91 | diff -r ef8dafc9fa4c -r a70404f79ba3 b | |
| 92 | --- /dev/null |
|
92 | --- /dev/null | |
| 93 | +++ b/b |
|
93 | +++ b/b | |
| 94 | @@ -0,0 +1,1 @@ |
|
94 | @@ -0,0 +1,1 @@ | |
| 95 | +a |
|
95 | +a | |
| 96 | % git=no: regular patch after qrefresh with copy |
|
96 | % git=no: regular patch after qrefresh with copy | |
| 97 | # HG changeset patch |
|
97 | # HG changeset patch | |
| 98 | # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 |
|
98 | # Parent ef8dafc9fa4caff80f6e243eb0171bcd60c455b4 | |
| 99 | # Date 0 0 |
|
99 | # Date 0 0 | |
| 100 |
|
100 | |||
| 101 | diff -r ef8dafc9fa4c b |
|
101 | diff -r ef8dafc9fa4c b | |
| 102 | --- /dev/null |
|
102 | --- /dev/null | |
| 103 | +++ b/b |
|
103 | +++ b/b | |
| 104 | @@ -0,0 +1,1 @@ |
|
104 | @@ -0,0 +1,1 @@ | |
| 105 | +a |
|
105 | +a | |
| 106 | diff -r ef8dafc9fa4c c |
|
106 | diff -r ef8dafc9fa4c c | |
| 107 | --- /dev/null |
|
107 | --- /dev/null | |
| 108 | +++ b/c |
|
108 | +++ b/c | |
| 109 | @@ -0,0 +1,1 @@ |
|
109 | @@ -0,0 +1,1 @@ | |
| 110 | +a |
|
110 | +a | |
| @@ -1,138 +1,138 b'' | |||||
| 1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 2 | created new head |
|
2 | created new head | |
| 3 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
3 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 4 | rev offset length base linkrev nodeid p1 p2 |
|
4 | rev offset length base linkrev nodeid p1 p2 | |
| 5 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
|
5 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 | |
| 6 | 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 |
|
6 | 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 | |
| 7 | 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 |
|
7 | 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 | |
| 8 | 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 |
|
8 | 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 | |
| 9 | rev offset length base linkrev nodeid p1 p2 |
|
9 | rev offset length base linkrev nodeid p1 p2 | |
| 10 |
0 0 75 0 7 |
|
10 | 0 0 75 0 7 2565f3199a74 000000000000 000000000000 | |
| 11 | rev offset length base linkrev nodeid p1 p2 |
|
11 | rev offset length base linkrev nodeid p1 p2 | |
| 12 |
0 0 75 0 8 |
|
12 | 0 0 75 0 8 2565f3199a74 000000000000 000000000000 | |
| 13 | rev offset length base linkrev nodeid p1 p2 |
|
13 | rev offset length base linkrev nodeid p1 p2 | |
| 14 | 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 |
|
14 | 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 | |
| 15 | rev offset length base linkrev nodeid p1 p2 |
|
15 | rev offset length base linkrev nodeid p1 p2 | |
| 16 | 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 |
|
16 | 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 | |
| 17 | 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 |
|
17 | 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 | |
| 18 | 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 |
|
18 | 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 | |
| 19 | 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 |
|
19 | 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 | |
| 20 | 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 |
|
20 | 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 | |
| 21 |
5 250 68 3 7 |
|
21 | 5 250 68 3 7 09bb521d218d de68e904d169 000000000000 | |
| 22 |
6 318 54 6 8 |
|
22 | 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000 | |
| 23 | checking changesets |
|
23 | checking changesets | |
| 24 | checking manifests |
|
24 | checking manifests | |
| 25 | crosschecking files in changesets and manifests |
|
25 | crosschecking files in changesets and manifests | |
| 26 | checking files |
|
26 | checking files | |
| 27 | 4 files, 9 changesets, 7 total revisions |
|
27 | 4 files, 9 changesets, 7 total revisions | |
| 28 | pushing to test-0 |
|
28 | pushing to test-0 | |
| 29 | searching for changes |
|
29 | searching for changes | |
| 30 | adding changesets |
|
30 | adding changesets | |
| 31 | adding manifests |
|
31 | adding manifests | |
| 32 | adding file changes |
|
32 | adding file changes | |
| 33 | added 1 changesets with 1 changes to 1 files |
|
33 | added 1 changesets with 1 changes to 1 files | |
| 34 | checking changesets |
|
34 | checking changesets | |
| 35 | checking manifests |
|
35 | checking manifests | |
| 36 | crosschecking files in changesets and manifests |
|
36 | crosschecking files in changesets and manifests | |
| 37 | checking files |
|
37 | checking files | |
| 38 | 1 files, 1 changesets, 1 total revisions |
|
38 | 1 files, 1 changesets, 1 total revisions | |
| 39 | pushing to test-1 |
|
39 | pushing to test-1 | |
| 40 | searching for changes |
|
40 | searching for changes | |
| 41 | adding changesets |
|
41 | adding changesets | |
| 42 | adding manifests |
|
42 | adding manifests | |
| 43 | adding file changes |
|
43 | adding file changes | |
| 44 | added 2 changesets with 2 changes to 1 files |
|
44 | added 2 changesets with 2 changes to 1 files | |
| 45 | checking changesets |
|
45 | checking changesets | |
| 46 | checking manifests |
|
46 | checking manifests | |
| 47 | crosschecking files in changesets and manifests |
|
47 | crosschecking files in changesets and manifests | |
| 48 | checking files |
|
48 | checking files | |
| 49 | 1 files, 2 changesets, 2 total revisions |
|
49 | 1 files, 2 changesets, 2 total revisions | |
| 50 | pushing to test-2 |
|
50 | pushing to test-2 | |
| 51 | searching for changes |
|
51 | searching for changes | |
| 52 | adding changesets |
|
52 | adding changesets | |
| 53 | adding manifests |
|
53 | adding manifests | |
| 54 | adding file changes |
|
54 | adding file changes | |
| 55 | added 3 changesets with 3 changes to 1 files |
|
55 | added 3 changesets with 3 changes to 1 files | |
| 56 | checking changesets |
|
56 | checking changesets | |
| 57 | checking manifests |
|
57 | checking manifests | |
| 58 | crosschecking files in changesets and manifests |
|
58 | crosschecking files in changesets and manifests | |
| 59 | checking files |
|
59 | checking files | |
| 60 | 1 files, 3 changesets, 3 total revisions |
|
60 | 1 files, 3 changesets, 3 total revisions | |
| 61 | pushing to test-3 |
|
61 | pushing to test-3 | |
| 62 | searching for changes |
|
62 | searching for changes | |
| 63 | adding changesets |
|
63 | adding changesets | |
| 64 | adding manifests |
|
64 | adding manifests | |
| 65 | adding file changes |
|
65 | adding file changes | |
| 66 | added 4 changesets with 4 changes to 1 files |
|
66 | added 4 changesets with 4 changes to 1 files | |
| 67 | checking changesets |
|
67 | checking changesets | |
| 68 | checking manifests |
|
68 | checking manifests | |
| 69 | crosschecking files in changesets and manifests |
|
69 | crosschecking files in changesets and manifests | |
| 70 | checking files |
|
70 | checking files | |
| 71 | 1 files, 4 changesets, 4 total revisions |
|
71 | 1 files, 4 changesets, 4 total revisions | |
| 72 | pushing to test-4 |
|
72 | pushing to test-4 | |
| 73 | searching for changes |
|
73 | searching for changes | |
| 74 | adding changesets |
|
74 | adding changesets | |
| 75 | adding manifests |
|
75 | adding manifests | |
| 76 | adding file changes |
|
76 | adding file changes | |
| 77 | added 2 changesets with 2 changes to 1 files |
|
77 | added 2 changesets with 2 changes to 1 files | |
| 78 | checking changesets |
|
78 | checking changesets | |
| 79 | checking manifests |
|
79 | checking manifests | |
| 80 | crosschecking files in changesets and manifests |
|
80 | crosschecking files in changesets and manifests | |
| 81 | checking files |
|
81 | checking files | |
| 82 | 1 files, 2 changesets, 2 total revisions |
|
82 | 1 files, 2 changesets, 2 total revisions | |
| 83 | pushing to test-5 |
|
83 | pushing to test-5 | |
| 84 | searching for changes |
|
84 | searching for changes | |
| 85 | adding changesets |
|
85 | adding changesets | |
| 86 | adding manifests |
|
86 | adding manifests | |
| 87 | adding file changes |
|
87 | adding file changes | |
| 88 | added 3 changesets with 3 changes to 1 files |
|
88 | added 3 changesets with 3 changes to 1 files | |
| 89 | checking changesets |
|
89 | checking changesets | |
| 90 | checking manifests |
|
90 | checking manifests | |
| 91 | crosschecking files in changesets and manifests |
|
91 | crosschecking files in changesets and manifests | |
| 92 | checking files |
|
92 | checking files | |
| 93 | 1 files, 3 changesets, 3 total revisions |
|
93 | 1 files, 3 changesets, 3 total revisions | |
| 94 | pushing to test-6 |
|
94 | pushing to test-6 | |
| 95 | searching for changes |
|
95 | searching for changes | |
| 96 | adding changesets |
|
96 | adding changesets | |
| 97 | adding manifests |
|
97 | adding manifests | |
| 98 | adding file changes |
|
98 | adding file changes | |
| 99 | added 4 changesets with 5 changes to 2 files |
|
99 | added 4 changesets with 5 changes to 2 files | |
| 100 | checking changesets |
|
100 | checking changesets | |
| 101 | checking manifests |
|
101 | checking manifests | |
| 102 | crosschecking files in changesets and manifests |
|
102 | crosschecking files in changesets and manifests | |
| 103 | checking files |
|
103 | checking files | |
| 104 | 2 files, 4 changesets, 5 total revisions |
|
104 | 2 files, 4 changesets, 5 total revisions | |
| 105 | pushing to test-7 |
|
105 | pushing to test-7 | |
| 106 | searching for changes |
|
106 | searching for changes | |
| 107 | adding changesets |
|
107 | adding changesets | |
| 108 | adding manifests |
|
108 | adding manifests | |
| 109 | adding file changes |
|
109 | adding file changes | |
| 110 | added 5 changesets with 6 changes to 3 files |
|
110 | added 5 changesets with 6 changes to 3 files | |
| 111 | checking changesets |
|
111 | checking changesets | |
| 112 | checking manifests |
|
112 | checking manifests | |
| 113 | crosschecking files in changesets and manifests |
|
113 | crosschecking files in changesets and manifests | |
| 114 | checking files |
|
114 | checking files | |
| 115 | 3 files, 5 changesets, 6 total revisions |
|
115 | 3 files, 5 changesets, 6 total revisions | |
| 116 | pushing to test-8 |
|
116 | pushing to test-8 | |
| 117 | searching for changes |
|
117 | searching for changes | |
| 118 | adding changesets |
|
118 | adding changesets | |
| 119 | adding manifests |
|
119 | adding manifests | |
| 120 | adding file changes |
|
120 | adding file changes | |
| 121 | added 5 changesets with 5 changes to 2 files |
|
121 | added 5 changesets with 5 changes to 2 files | |
| 122 | checking changesets |
|
122 | checking changesets | |
| 123 | checking manifests |
|
123 | checking manifests | |
| 124 | crosschecking files in changesets and manifests |
|
124 | crosschecking files in changesets and manifests | |
| 125 | checking files |
|
125 | checking files | |
| 126 | 2 files, 5 changesets, 5 total revisions |
|
126 | 2 files, 5 changesets, 5 total revisions | |
| 127 | pulling from ../test-7 |
|
127 | pulling from ../test-7 | |
| 128 | searching for changes |
|
128 | searching for changes | |
| 129 | adding changesets |
|
129 | adding changesets | |
| 130 | adding manifests |
|
130 | adding manifests | |
| 131 | adding file changes |
|
131 | adding file changes | |
| 132 | added 4 changesets with 2 changes to 3 files (+1 heads) |
|
132 | added 4 changesets with 2 changes to 3 files (+1 heads) | |
| 133 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
133 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 134 | checking changesets |
|
134 | checking changesets | |
| 135 | checking manifests |
|
135 | checking manifests | |
| 136 | crosschecking files in changesets and manifests |
|
136 | crosschecking files in changesets and manifests | |
| 137 | checking files |
|
137 | checking files | |
| 138 | 4 files, 9 changesets, 7 total revisions |
|
138 | 4 files, 9 changesets, 7 total revisions | |
| @@ -1,595 +1,595 b'' | |||||
| 1 | % help |
|
1 | % help | |
| 2 | hg record [OPTION]... [FILE]... |
|
2 | hg record [OPTION]... [FILE]... | |
| 3 |
|
3 | |||
| 4 | interactively select changes to commit |
|
4 | interactively select changes to commit | |
| 5 |
|
5 | |||
| 6 | If a list of files is omitted, all changes reported by "hg status" will be |
|
6 | If a list of files is omitted, all changes reported by "hg status" will be | |
| 7 | candidates for recording. |
|
7 | candidates for recording. | |
| 8 |
|
8 | |||
| 9 | See 'hg help dates' for a list of formats valid for -d/--date. |
|
9 | See 'hg help dates' for a list of formats valid for -d/--date. | |
| 10 |
|
10 | |||
| 11 | You will be prompted for whether to record changes to each modified file, |
|
11 | You will be prompted for whether to record changes to each modified file, | |
| 12 | and for files with multiple changes, for each change to use. For each |
|
12 | and for files with multiple changes, for each change to use. For each | |
| 13 | query, the following responses are possible: |
|
13 | query, the following responses are possible: | |
| 14 |
|
14 | |||
| 15 | y - record this change |
|
15 | y - record this change | |
| 16 | n - skip this change |
|
16 | n - skip this change | |
| 17 |
|
17 | |||
| 18 | s - skip remaining changes to this file |
|
18 | s - skip remaining changes to this file | |
| 19 | f - record remaining changes to this file |
|
19 | f - record remaining changes to this file | |
| 20 |
|
20 | |||
| 21 | d - done, skip remaining changes and files |
|
21 | d - done, skip remaining changes and files | |
| 22 | a - record all changes to all remaining files |
|
22 | a - record all changes to all remaining files | |
| 23 | q - quit, recording no changes |
|
23 | q - quit, recording no changes | |
| 24 |
|
24 | |||
| 25 | ? - display help |
|
25 | ? - display help | |
| 26 |
|
26 | |||
| 27 | options: |
|
27 | options: | |
| 28 |
|
28 | |||
| 29 | -A --addremove mark new/missing files as added/removed before committing |
|
29 | -A --addremove mark new/missing files as added/removed before committing | |
| 30 | --close-branch mark a branch as closed, hiding it from the branch list |
|
30 | --close-branch mark a branch as closed, hiding it from the branch list | |
| 31 | -I --include include names matching the given patterns |
|
31 | -I --include include names matching the given patterns | |
| 32 | -X --exclude exclude names matching the given patterns |
|
32 | -X --exclude exclude names matching the given patterns | |
| 33 | -m --message use <text> as commit message |
|
33 | -m --message use <text> as commit message | |
| 34 | -l --logfile read commit message from <file> |
|
34 | -l --logfile read commit message from <file> | |
| 35 | -d --date record datecode as commit date |
|
35 | -d --date record datecode as commit date | |
| 36 | -u --user record the specified user as committer |
|
36 | -u --user record the specified user as committer | |
| 37 |
|
37 | |||
| 38 | use "hg -v help record" to show global options |
|
38 | use "hg -v help record" to show global options | |
| 39 | % select no files |
|
39 | % select no files | |
| 40 | diff --git a/empty-rw b/empty-rw |
|
40 | diff --git a/empty-rw b/empty-rw | |
| 41 | new file mode 100644 |
|
41 | new file mode 100644 | |
| 42 | examine changes to 'empty-rw'? [Ynsfdaq?] no changes to record |
|
42 | examine changes to 'empty-rw'? [Ynsfdaq?] no changes to record | |
| 43 |
|
43 | |||
| 44 | changeset: -1:000000000000 |
|
44 | changeset: -1:000000000000 | |
| 45 | tag: tip |
|
45 | tag: tip | |
| 46 | user: |
|
46 | user: | |
| 47 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
47 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 48 |
|
48 | |||
| 49 |
|
49 | |||
| 50 | % select files but no hunks |
|
50 | % select files but no hunks | |
| 51 | diff --git a/empty-rw b/empty-rw |
|
51 | diff --git a/empty-rw b/empty-rw | |
| 52 | new file mode 100644 |
|
52 | new file mode 100644 | |
| 53 | examine changes to 'empty-rw'? [Ynsfdaq?] abort: empty commit message |
|
53 | examine changes to 'empty-rw'? [Ynsfdaq?] abort: empty commit message | |
| 54 |
|
54 | |||
| 55 | changeset: -1:000000000000 |
|
55 | changeset: -1:000000000000 | |
| 56 | tag: tip |
|
56 | tag: tip | |
| 57 | user: |
|
57 | user: | |
| 58 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
58 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 59 |
|
59 | |||
| 60 |
|
60 | |||
| 61 | % record empty file |
|
61 | % record empty file | |
| 62 | diff --git a/empty-rw b/empty-rw |
|
62 | diff --git a/empty-rw b/empty-rw | |
| 63 | new file mode 100644 |
|
63 | new file mode 100644 | |
| 64 | examine changes to 'empty-rw'? [Ynsfdaq?] |
|
64 | examine changes to 'empty-rw'? [Ynsfdaq?] | |
| 65 | changeset: 0:c0708cf4e46e |
|
65 | changeset: 0:c0708cf4e46e | |
| 66 | tag: tip |
|
66 | tag: tip | |
| 67 | user: test |
|
67 | user: test | |
| 68 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
68 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 69 | summary: empty |
|
69 | summary: empty | |
| 70 |
|
70 | |||
| 71 |
|
71 | |||
| 72 | % rename empty file |
|
72 | % rename empty file | |
| 73 | diff --git a/empty-rw b/empty-rename |
|
73 | diff --git a/empty-rw b/empty-rename | |
| 74 | rename from empty-rw |
|
74 | rename from empty-rw | |
| 75 | rename to empty-rename |
|
75 | rename to empty-rename | |
| 76 | examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?] |
|
76 | examine changes to 'empty-rw' and 'empty-rename'? [Ynsfdaq?] | |
| 77 |
changeset: 1:d |
|
77 | changeset: 1:d695e8dcb197 | |
| 78 | tag: tip |
|
78 | tag: tip | |
| 79 | user: test |
|
79 | user: test | |
| 80 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
80 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 81 | summary: rename |
|
81 | summary: rename | |
| 82 |
|
82 | |||
| 83 |
|
83 | |||
| 84 | % copy empty file |
|
84 | % copy empty file | |
| 85 | diff --git a/empty-rename b/empty-copy |
|
85 | diff --git a/empty-rename b/empty-copy | |
| 86 | copy from empty-rename |
|
86 | copy from empty-rename | |
| 87 | copy to empty-copy |
|
87 | copy to empty-copy | |
| 88 | examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?] |
|
88 | examine changes to 'empty-rename' and 'empty-copy'? [Ynsfdaq?] | |
| 89 |
changeset: 2: |
|
89 | changeset: 2:1d4b90bea524 | |
| 90 | tag: tip |
|
90 | tag: tip | |
| 91 | user: test |
|
91 | user: test | |
| 92 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
92 | date: Thu Jan 01 00:00:02 1970 +0000 | |
| 93 | summary: copy |
|
93 | summary: copy | |
| 94 |
|
94 | |||
| 95 |
|
95 | |||
| 96 | % delete empty file |
|
96 | % delete empty file | |
| 97 | diff --git a/empty-copy b/empty-copy |
|
97 | diff --git a/empty-copy b/empty-copy | |
| 98 | deleted file mode 100644 |
|
98 | deleted file mode 100644 | |
| 99 | examine changes to 'empty-copy'? [Ynsfdaq?] |
|
99 | examine changes to 'empty-copy'? [Ynsfdaq?] | |
| 100 |
changeset: 3: |
|
100 | changeset: 3:b39a238f01a1 | |
| 101 | tag: tip |
|
101 | tag: tip | |
| 102 | user: test |
|
102 | user: test | |
| 103 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
103 | date: Thu Jan 01 00:00:03 1970 +0000 | |
| 104 | summary: delete |
|
104 | summary: delete | |
| 105 |
|
105 | |||
| 106 |
|
106 | |||
| 107 | % add binary file |
|
107 | % add binary file | |
| 108 | 1 changesets found |
|
108 | 1 changesets found | |
| 109 | diff --git a/tip.bundle b/tip.bundle |
|
109 | diff --git a/tip.bundle b/tip.bundle | |
| 110 | new file mode 100644 |
|
110 | new file mode 100644 | |
| 111 | this is a binary file |
|
111 | this is a binary file | |
| 112 | examine changes to 'tip.bundle'? [Ynsfdaq?] |
|
112 | examine changes to 'tip.bundle'? [Ynsfdaq?] | |
| 113 | changeset: 4:9e998a545a8b |
|
113 | changeset: 4:ad816da3711e | |
| 114 | tag: tip |
|
114 | tag: tip | |
| 115 | user: test |
|
115 | user: test | |
| 116 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
116 | date: Thu Jan 01 00:00:04 1970 +0000 | |
| 117 | summary: binary |
|
117 | summary: binary | |
| 118 |
|
118 | |||
| 119 | diff -r a2546574bce9 -r 9e998a545a8b tip.bundle |
|
119 | diff -r b39a238f01a1 -r ad816da3711e tip.bundle | |
| 120 | Binary file tip.bundle has changed |
|
120 | Binary file tip.bundle has changed | |
| 121 |
|
121 | |||
| 122 | % change binary file |
|
122 | % change binary file | |
| 123 | 1 changesets found |
|
123 | 1 changesets found | |
| 124 | diff --git a/tip.bundle b/tip.bundle |
|
124 | diff --git a/tip.bundle b/tip.bundle | |
| 125 | this modifies a binary file (all or nothing) |
|
125 | this modifies a binary file (all or nothing) | |
| 126 | examine changes to 'tip.bundle'? [Ynsfdaq?] |
|
126 | examine changes to 'tip.bundle'? [Ynsfdaq?] | |
| 127 |
changeset: 5: |
|
127 | changeset: 5:dccd6f3eb485 | |
| 128 | tag: tip |
|
128 | tag: tip | |
| 129 | user: test |
|
129 | user: test | |
| 130 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
130 | date: Thu Jan 01 00:00:05 1970 +0000 | |
| 131 | summary: binary-change |
|
131 | summary: binary-change | |
| 132 |
|
132 | |||
| 133 | diff -r 9e998a545a8b -r 93d05561507d tip.bundle |
|
133 | diff -r ad816da3711e -r dccd6f3eb485 tip.bundle | |
| 134 | Binary file tip.bundle has changed |
|
134 | Binary file tip.bundle has changed | |
| 135 |
|
135 | |||
| 136 | % rename and change binary file |
|
136 | % rename and change binary file | |
| 137 | 1 changesets found |
|
137 | 1 changesets found | |
| 138 | diff --git a/tip.bundle b/top.bundle |
|
138 | diff --git a/tip.bundle b/top.bundle | |
| 139 | rename from tip.bundle |
|
139 | rename from tip.bundle | |
| 140 | rename to top.bundle |
|
140 | rename to top.bundle | |
| 141 | this modifies a binary file (all or nothing) |
|
141 | this modifies a binary file (all or nothing) | |
| 142 | examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?] |
|
142 | examine changes to 'tip.bundle' and 'top.bundle'? [Ynsfdaq?] | |
| 143 |
changeset: 6: |
|
143 | changeset: 6:7fa44105f5b3 | |
| 144 | tag: tip |
|
144 | tag: tip | |
| 145 | user: test |
|
145 | user: test | |
| 146 | date: Thu Jan 01 00:00:06 1970 +0000 |
|
146 | date: Thu Jan 01 00:00:06 1970 +0000 | |
| 147 | summary: binary-change-rename |
|
147 | summary: binary-change-rename | |
| 148 |
|
148 | |||
| 149 | diff -r 93d05561507d -r 699cc1bea9aa tip.bundle |
|
149 | diff -r dccd6f3eb485 -r 7fa44105f5b3 tip.bundle | |
| 150 | Binary file tip.bundle has changed |
|
150 | Binary file tip.bundle has changed | |
| 151 | diff -r 93d05561507d -r 699cc1bea9aa top.bundle |
|
151 | diff -r dccd6f3eb485 -r 7fa44105f5b3 top.bundle | |
| 152 | Binary file top.bundle has changed |
|
152 | Binary file top.bundle has changed | |
| 153 |
|
153 | |||
| 154 | % add plain file |
|
154 | % add plain file | |
| 155 | diff --git a/plain b/plain |
|
155 | diff --git a/plain b/plain | |
| 156 | new file mode 100644 |
|
156 | new file mode 100644 | |
| 157 | examine changes to 'plain'? [Ynsfdaq?] |
|
157 | examine changes to 'plain'? [Ynsfdaq?] | |
| 158 |
changeset: 7:11 |
|
158 | changeset: 7:11fb457c1be4 | |
| 159 | tag: tip |
|
159 | tag: tip | |
| 160 | user: test |
|
160 | user: test | |
| 161 | date: Thu Jan 01 00:00:07 1970 +0000 |
|
161 | date: Thu Jan 01 00:00:07 1970 +0000 | |
| 162 | summary: plain |
|
162 | summary: plain | |
| 163 |
|
163 | |||
| 164 | diff -r 699cc1bea9aa -r 118ed744216b plain |
|
164 | diff -r 7fa44105f5b3 -r 11fb457c1be4 plain | |
| 165 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
165 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
| 166 | +++ b/plain Thu Jan 01 00:00:07 1970 +0000 |
|
166 | +++ b/plain Thu Jan 01 00:00:07 1970 +0000 | |
| 167 | @@ -0,0 +1,10 @@ |
|
167 | @@ -0,0 +1,10 @@ | |
| 168 | +1 |
|
168 | +1 | |
| 169 | +2 |
|
169 | +2 | |
| 170 | +3 |
|
170 | +3 | |
| 171 | +4 |
|
171 | +4 | |
| 172 | +5 |
|
172 | +5 | |
| 173 | +6 |
|
173 | +6 | |
| 174 | +7 |
|
174 | +7 | |
| 175 | +8 |
|
175 | +8 | |
| 176 | +9 |
|
176 | +9 | |
| 177 | +10 |
|
177 | +10 | |
| 178 |
|
178 | |||
| 179 | % modify end of plain file |
|
179 | % modify end of plain file | |
| 180 | diff --git a/plain b/plain |
|
180 | diff --git a/plain b/plain | |
| 181 | 1 hunks, 1 lines changed |
|
181 | 1 hunks, 1 lines changed | |
| 182 | examine changes to 'plain'? [Ynsfdaq?] @@ -8,3 +8,4 @@ |
|
182 | examine changes to 'plain'? [Ynsfdaq?] @@ -8,3 +8,4 @@ | |
| 183 | 8 |
|
183 | 8 | |
| 184 | 9 |
|
184 | 9 | |
| 185 | 10 |
|
185 | 10 | |
| 186 | +11 |
|
186 | +11 | |
| 187 | record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, no EOL |
|
187 | record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, no EOL | |
| 188 | diff --git a/plain b/plain |
|
188 | diff --git a/plain b/plain | |
| 189 | 1 hunks, 1 lines changed |
|
189 | 1 hunks, 1 lines changed | |
| 190 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,4 @@ |
|
190 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,4 @@ | |
| 191 | 9 |
|
191 | 9 | |
| 192 | 10 |
|
192 | 10 | |
| 193 | 11 |
|
193 | 11 | |
| 194 | +cf81a2760718a74d44c0c2eecb72f659e63a69c5 |
|
194 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 | |
| 195 | \ No newline at end of file |
|
195 | \ No newline at end of file | |
| 196 | record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, add EOL |
|
196 | record this change to 'plain'? [Ynsfdaq?] % modify end of plain file, add EOL | |
| 197 | diff --git a/plain b/plain |
|
197 | diff --git a/plain b/plain | |
| 198 | 1 hunks, 2 lines changed |
|
198 | 1 hunks, 2 lines changed | |
| 199 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,4 +9,4 @@ |
|
199 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,4 +9,4 @@ | |
| 200 | 9 |
|
200 | 9 | |
| 201 | 10 |
|
201 | 10 | |
| 202 | 11 |
|
202 | 11 | |
| 203 | -cf81a2760718a74d44c0c2eecb72f659e63a69c5 |
|
203 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 | |
| 204 | \ No newline at end of file |
|
204 | \ No newline at end of file | |
| 205 | +cf81a2760718a74d44c0c2eecb72f659e63a69c5 |
|
205 | +7264f99c5f5ff3261504828afa4fb4d406c3af54 | |
| 206 | record this change to 'plain'? [Ynsfdaq?] % modify beginning, trim end, record both |
|
206 | record this change to 'plain'? [Ynsfdaq?] % modify beginning, trim end, record both | |
| 207 | diff --git a/plain b/plain |
|
207 | diff --git a/plain b/plain | |
| 208 | 2 hunks, 4 lines changed |
|
208 | 2 hunks, 4 lines changed | |
| 209 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,4 +1,4 @@ |
|
209 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,4 +1,4 @@ | |
| 210 | -1 |
|
210 | -1 | |
| 211 | +2 |
|
211 | +2 | |
| 212 | 2 |
|
212 | 2 | |
| 213 | 3 |
|
213 | 3 | |
| 214 | 4 |
|
214 | 4 | |
| 215 | record change 1/2 to 'plain'? [Ynsfdaq?] @@ -8,5 +8,3 @@ |
|
215 | record change 1/2 to 'plain'? [Ynsfdaq?] @@ -8,5 +8,3 @@ | |
| 216 | 8 |
|
216 | 8 | |
| 217 | 9 |
|
217 | 9 | |
| 218 | 10 |
|
218 | 10 | |
| 219 | -11 |
|
219 | -11 | |
| 220 | -cf81a2760718a74d44c0c2eecb72f659e63a69c5 |
|
220 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 | |
| 221 | record change 2/2 to 'plain'? [Ynsfdaq?] |
|
221 | record change 2/2 to 'plain'? [Ynsfdaq?] | |
| 222 |
changeset: 11: |
|
222 | changeset: 11:efca65c9b09e | |
| 223 | tag: tip |
|
223 | tag: tip | |
| 224 | user: test |
|
224 | user: test | |
| 225 | date: Thu Jan 01 00:00:10 1970 +0000 |
|
225 | date: Thu Jan 01 00:00:10 1970 +0000 | |
| 226 | summary: begin-and-end |
|
226 | summary: begin-and-end | |
| 227 |
|
227 | |||
| 228 | diff -r e2ecd9b0b78d -r d09ab1967dab plain |
|
228 | diff -r cd07d48e8cbe -r efca65c9b09e plain | |
| 229 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
229 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 | |
| 230 | +++ b/plain Thu Jan 01 00:00:10 1970 +0000 |
|
230 | +++ b/plain Thu Jan 01 00:00:10 1970 +0000 | |
| 231 | @@ -1,4 +1,4 @@ |
|
231 | @@ -1,4 +1,4 @@ | |
| 232 | -1 |
|
232 | -1 | |
| 233 | +2 |
|
233 | +2 | |
| 234 | 2 |
|
234 | 2 | |
| 235 | 3 |
|
235 | 3 | |
| 236 | 4 |
|
236 | 4 | |
| 237 | @@ -8,5 +8,3 @@ |
|
237 | @@ -8,5 +8,3 @@ | |
| 238 | 8 |
|
238 | 8 | |
| 239 | 9 |
|
239 | 9 | |
| 240 | 10 |
|
240 | 10 | |
| 241 | -11 |
|
241 | -11 | |
| 242 | -cf81a2760718a74d44c0c2eecb72f659e63a69c5 |
|
242 | -7264f99c5f5ff3261504828afa4fb4d406c3af54 | |
| 243 |
|
243 | |||
| 244 | % trim beginning, modify end |
|
244 | % trim beginning, modify end | |
| 245 | % record end |
|
245 | % record end | |
| 246 | diff --git a/plain b/plain |
|
246 | diff --git a/plain b/plain | |
| 247 | 2 hunks, 5 lines changed |
|
247 | 2 hunks, 5 lines changed | |
| 248 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,9 +1,6 @@ |
|
248 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,9 +1,6 @@ | |
| 249 | -2 |
|
249 | -2 | |
| 250 | -2 |
|
250 | -2 | |
| 251 | -3 |
|
251 | -3 | |
| 252 | 4 |
|
252 | 4 | |
| 253 | 5 |
|
253 | 5 | |
| 254 | 6 |
|
254 | 6 | |
| 255 | 7 |
|
255 | 7 | |
| 256 | 8 |
|
256 | 8 | |
| 257 | 9 |
|
257 | 9 | |
| 258 | record change 1/2 to 'plain'? [Ynsfdaq?] @@ -4,7 +1,7 @@ |
|
258 | record change 1/2 to 'plain'? [Ynsfdaq?] @@ -4,7 +1,7 @@ | |
| 259 | 4 |
|
259 | 4 | |
| 260 | 5 |
|
260 | 5 | |
| 261 | 6 |
|
261 | 6 | |
| 262 | 7 |
|
262 | 7 | |
| 263 | 8 |
|
263 | 8 | |
| 264 | 9 |
|
264 | 9 | |
| 265 | -10 |
|
265 | -10 | |
| 266 | +10.new |
|
266 | +10.new | |
| 267 | record change 2/2 to 'plain'? [Ynsfdaq?] |
|
267 | record change 2/2 to 'plain'? [Ynsfdaq?] | |
| 268 |
changeset: 12: |
|
268 | changeset: 12:7d1e66983c15 | |
| 269 | tag: tip |
|
269 | tag: tip | |
| 270 | user: test |
|
270 | user: test | |
| 271 | date: Thu Jan 01 00:00:11 1970 +0000 |
|
271 | date: Thu Jan 01 00:00:11 1970 +0000 | |
| 272 | summary: end-only |
|
272 | summary: end-only | |
| 273 |
|
273 | |||
| 274 | diff -r d09ab1967dab -r 44516c9708ae plain |
|
274 | diff -r efca65c9b09e -r 7d1e66983c15 plain | |
| 275 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 |
|
275 | --- a/plain Thu Jan 01 00:00:10 1970 +0000 | |
| 276 | +++ b/plain Thu Jan 01 00:00:11 1970 +0000 |
|
276 | +++ b/plain Thu Jan 01 00:00:11 1970 +0000 | |
| 277 | @@ -7,4 +7,4 @@ |
|
277 | @@ -7,4 +7,4 @@ | |
| 278 | 7 |
|
278 | 7 | |
| 279 | 8 |
|
279 | 8 | |
| 280 | 9 |
|
280 | 9 | |
| 281 | -10 |
|
281 | -10 | |
| 282 | +10.new |
|
282 | +10.new | |
| 283 |
|
283 | |||
| 284 | % record beginning |
|
284 | % record beginning | |
| 285 | diff --git a/plain b/plain |
|
285 | diff --git a/plain b/plain | |
| 286 | 1 hunks, 3 lines changed |
|
286 | 1 hunks, 3 lines changed | |
| 287 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,3 @@ |
|
287 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,3 @@ | |
| 288 | -2 |
|
288 | -2 | |
| 289 | -2 |
|
289 | -2 | |
| 290 | -3 |
|
290 | -3 | |
| 291 | 4 |
|
291 | 4 | |
| 292 | 5 |
|
292 | 5 | |
| 293 | 6 |
|
293 | 6 | |
| 294 | record this change to 'plain'? [Ynsfdaq?] |
|
294 | record this change to 'plain'? [Ynsfdaq?] | |
| 295 |
changeset: 13: |
|
295 | changeset: 13:a09fc62a0e61 | |
| 296 | tag: tip |
|
296 | tag: tip | |
| 297 | user: test |
|
297 | user: test | |
| 298 | date: Thu Jan 01 00:00:12 1970 +0000 |
|
298 | date: Thu Jan 01 00:00:12 1970 +0000 | |
| 299 | summary: begin-only |
|
299 | summary: begin-only | |
| 300 |
|
300 | |||
| 301 | diff -r 44516c9708ae -r 3ebbace64a8d plain |
|
301 | diff -r 7d1e66983c15 -r a09fc62a0e61 plain | |
| 302 | --- a/plain Thu Jan 01 00:00:11 1970 +0000 |
|
302 | --- a/plain Thu Jan 01 00:00:11 1970 +0000 | |
| 303 | +++ b/plain Thu Jan 01 00:00:12 1970 +0000 |
|
303 | +++ b/plain Thu Jan 01 00:00:12 1970 +0000 | |
| 304 | @@ -1,6 +1,3 @@ |
|
304 | @@ -1,6 +1,3 @@ | |
| 305 | -2 |
|
305 | -2 | |
| 306 | -2 |
|
306 | -2 | |
| 307 | -3 |
|
307 | -3 | |
| 308 | 4 |
|
308 | 4 | |
| 309 | 5 |
|
309 | 5 | |
| 310 | 6 |
|
310 | 6 | |
| 311 |
|
311 | |||
| 312 | % add to beginning, trim from end |
|
312 | % add to beginning, trim from end | |
| 313 | % record end |
|
313 | % record end | |
| 314 | diff --git a/plain b/plain |
|
314 | diff --git a/plain b/plain | |
| 315 | 2 hunks, 4 lines changed |
|
315 | 2 hunks, 4 lines changed | |
| 316 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,9 @@ |
|
316 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,6 +1,9 @@ | |
| 317 | +1 |
|
317 | +1 | |
| 318 | +2 |
|
318 | +2 | |
| 319 | +3 |
|
319 | +3 | |
| 320 | 4 |
|
320 | 4 | |
| 321 | 5 |
|
321 | 5 | |
| 322 | 6 |
|
322 | 6 | |
| 323 | 7 |
|
323 | 7 | |
| 324 | 8 |
|
324 | 8 | |
| 325 | 9 |
|
325 | 9 | |
| 326 | record change 1/2 to 'plain'? [Ynsfdaq?] @@ -1,7 +4,6 @@ |
|
326 | record change 1/2 to 'plain'? [Ynsfdaq?] @@ -1,7 +4,6 @@ | |
| 327 | 4 |
|
327 | 4 | |
| 328 | 5 |
|
328 | 5 | |
| 329 | 6 |
|
329 | 6 | |
| 330 | 7 |
|
330 | 7 | |
| 331 | 8 |
|
331 | 8 | |
| 332 | 9 |
|
332 | 9 | |
| 333 | -10.new |
|
333 | -10.new | |
| 334 | record change 2/2 to 'plain'? [Ynsfdaq?] % add to beginning, middle, end |
|
334 | record change 2/2 to 'plain'? [Ynsfdaq?] % add to beginning, middle, end | |
| 335 | % record beginning, middle |
|
335 | % record beginning, middle | |
| 336 | diff --git a/plain b/plain |
|
336 | diff --git a/plain b/plain | |
| 337 | 3 hunks, 7 lines changed |
|
337 | 3 hunks, 7 lines changed | |
| 338 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,2 +1,5 @@ |
|
338 | examine changes to 'plain'? [Ynsfdaq?] @@ -1,2 +1,5 @@ | |
| 339 | +1 |
|
339 | +1 | |
| 340 | +2 |
|
340 | +2 | |
| 341 | +3 |
|
341 | +3 | |
| 342 | 4 |
|
342 | 4 | |
| 343 | 5 |
|
343 | 5 | |
| 344 | record change 1/3 to 'plain'? [Ynsfdaq?] @@ -1,6 +4,8 @@ |
|
344 | record change 1/3 to 'plain'? [Ynsfdaq?] @@ -1,6 +4,8 @@ | |
| 345 | 4 |
|
345 | 4 | |
| 346 | 5 |
|
346 | 5 | |
| 347 | +5.new |
|
347 | +5.new | |
| 348 | +5.reallynew |
|
348 | +5.reallynew | |
| 349 | 6 |
|
349 | 6 | |
| 350 | 7 |
|
350 | 7 | |
| 351 | 8 |
|
351 | 8 | |
| 352 | 9 |
|
352 | 9 | |
| 353 | record change 2/3 to 'plain'? [Ynsfdaq?] @@ -3,4 +8,6 @@ |
|
353 | record change 2/3 to 'plain'? [Ynsfdaq?] @@ -3,4 +8,6 @@ | |
| 354 | 6 |
|
354 | 6 | |
| 355 | 7 |
|
355 | 7 | |
| 356 | 8 |
|
356 | 8 | |
| 357 | 9 |
|
357 | 9 | |
| 358 | +10 |
|
358 | +10 | |
| 359 | +11 |
|
359 | +11 | |
| 360 | record change 3/3 to 'plain'? [Ynsfdaq?] |
|
360 | record change 3/3 to 'plain'? [Ynsfdaq?] | |
| 361 |
changeset: 15: |
|
361 | changeset: 15:7d137997f3a6 | |
| 362 | tag: tip |
|
362 | tag: tip | |
| 363 | user: test |
|
363 | user: test | |
| 364 | date: Thu Jan 01 00:00:14 1970 +0000 |
|
364 | date: Thu Jan 01 00:00:14 1970 +0000 | |
| 365 | summary: middle-only |
|
365 | summary: middle-only | |
| 366 |
|
366 | |||
| 367 | diff -r efc0dad7bd9f -r c1c639d8b268 plain |
|
367 | diff -r c0b8e5fb0be6 -r 7d137997f3a6 plain | |
| 368 | --- a/plain Thu Jan 01 00:00:13 1970 +0000 |
|
368 | --- a/plain Thu Jan 01 00:00:13 1970 +0000 | |
| 369 | +++ b/plain Thu Jan 01 00:00:14 1970 +0000 |
|
369 | +++ b/plain Thu Jan 01 00:00:14 1970 +0000 | |
| 370 | @@ -1,5 +1,10 @@ |
|
370 | @@ -1,5 +1,10 @@ | |
| 371 | +1 |
|
371 | +1 | |
| 372 | +2 |
|
372 | +2 | |
| 373 | +3 |
|
373 | +3 | |
| 374 | 4 |
|
374 | 4 | |
| 375 | 5 |
|
375 | 5 | |
| 376 | +5.new |
|
376 | +5.new | |
| 377 | +5.reallynew |
|
377 | +5.reallynew | |
| 378 | 6 |
|
378 | 6 | |
| 379 | 7 |
|
379 | 7 | |
| 380 | 8 |
|
380 | 8 | |
| 381 |
|
381 | |||
| 382 | % record end |
|
382 | % record end | |
| 383 | diff --git a/plain b/plain |
|
383 | diff --git a/plain b/plain | |
| 384 | 1 hunks, 2 lines changed |
|
384 | 1 hunks, 2 lines changed | |
| 385 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,5 @@ |
|
385 | examine changes to 'plain'? [Ynsfdaq?] @@ -9,3 +9,5 @@ | |
| 386 | 7 |
|
386 | 7 | |
| 387 | 8 |
|
387 | 8 | |
| 388 | 9 |
|
388 | 9 | |
| 389 | +10 |
|
389 | +10 | |
| 390 | +11 |
|
390 | +11 | |
| 391 | record this change to 'plain'? [Ynsfdaq?] |
|
391 | record this change to 'plain'? [Ynsfdaq?] | |
| 392 |
changeset: 16: |
|
392 | changeset: 16:4959e3ff13eb | |
| 393 | tag: tip |
|
393 | tag: tip | |
| 394 | user: test |
|
394 | user: test | |
| 395 | date: Thu Jan 01 00:00:15 1970 +0000 |
|
395 | date: Thu Jan 01 00:00:15 1970 +0000 | |
| 396 | summary: end-only |
|
396 | summary: end-only | |
| 397 |
|
397 | |||
| 398 | diff -r c1c639d8b268 -r 80b74bbc7808 plain |
|
398 | diff -r 7d137997f3a6 -r 4959e3ff13eb plain | |
| 399 | --- a/plain Thu Jan 01 00:00:14 1970 +0000 |
|
399 | --- a/plain Thu Jan 01 00:00:14 1970 +0000 | |
| 400 | +++ b/plain Thu Jan 01 00:00:15 1970 +0000 |
|
400 | +++ b/plain Thu Jan 01 00:00:15 1970 +0000 | |
| 401 | @@ -9,3 +9,5 @@ |
|
401 | @@ -9,3 +9,5 @@ | |
| 402 | 7 |
|
402 | 7 | |
| 403 | 8 |
|
403 | 8 | |
| 404 | 9 |
|
404 | 9 | |
| 405 | +10 |
|
405 | +10 | |
| 406 | +11 |
|
406 | +11 | |
| 407 |
|
407 | |||
| 408 | adding subdir/a |
|
408 | adding subdir/a | |
| 409 | diff --git a/subdir/a b/subdir/a |
|
409 | diff --git a/subdir/a b/subdir/a | |
| 410 | 1 hunks, 1 lines changed |
|
410 | 1 hunks, 1 lines changed | |
| 411 | examine changes to 'subdir/a'? [Ynsfdaq?] @@ -1,1 +1,2 @@ |
|
411 | examine changes to 'subdir/a'? [Ynsfdaq?] @@ -1,1 +1,2 @@ | |
| 412 | a |
|
412 | a | |
| 413 | +a |
|
413 | +a | |
| 414 | record this change to 'subdir/a'? [Ynsfdaq?] |
|
414 | record this change to 'subdir/a'? [Ynsfdaq?] | |
| 415 |
changeset: 18: |
|
415 | changeset: 18:40698cd490b2 | |
| 416 | tag: tip |
|
416 | tag: tip | |
| 417 | user: test |
|
417 | user: test | |
| 418 | date: Thu Jan 01 00:00:16 1970 +0000 |
|
418 | date: Thu Jan 01 00:00:16 1970 +0000 | |
| 419 | summary: subdir-change |
|
419 | summary: subdir-change | |
| 420 |
|
420 | |||
| 421 |
diff -r |
|
421 | diff -r 661eacdc08b9 -r 40698cd490b2 subdir/a | |
| 422 | --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
422 | --- a/subdir/a Thu Jan 01 00:00:16 1970 +0000 | |
| 423 | +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 |
|
423 | +++ b/subdir/a Thu Jan 01 00:00:16 1970 +0000 | |
| 424 | @@ -1,1 +1,2 @@ |
|
424 | @@ -1,1 +1,2 @@ | |
| 425 | a |
|
425 | a | |
| 426 | +a |
|
426 | +a | |
| 427 |
|
427 | |||
| 428 | % help, quit |
|
428 | % help, quit | |
| 429 | diff --git a/subdir/f1 b/subdir/f1 |
|
429 | diff --git a/subdir/f1 b/subdir/f1 | |
| 430 | 1 hunks, 1 lines changed |
|
430 | 1 hunks, 1 lines changed | |
| 431 | examine changes to 'subdir/f1'? [Ynsfdaq?] y - record this change |
|
431 | examine changes to 'subdir/f1'? [Ynsfdaq?] y - record this change | |
| 432 | n - skip this change |
|
432 | n - skip this change | |
| 433 | s - skip remaining changes to this file |
|
433 | s - skip remaining changes to this file | |
| 434 | f - record remaining changes to this file |
|
434 | f - record remaining changes to this file | |
| 435 | d - done, skip remaining changes and files |
|
435 | d - done, skip remaining changes and files | |
| 436 | a - record all changes to all remaining files |
|
436 | a - record all changes to all remaining files | |
| 437 | q - quit, recording no changes |
|
437 | q - quit, recording no changes | |
| 438 | ? - display help |
|
438 | ? - display help | |
| 439 | examine changes to 'subdir/f1'? [Ynsfdaq?] abort: user quit |
|
439 | examine changes to 'subdir/f1'? [Ynsfdaq?] abort: user quit | |
| 440 | % skip |
|
440 | % skip | |
| 441 | diff --git a/subdir/f1 b/subdir/f1 |
|
441 | diff --git a/subdir/f1 b/subdir/f1 | |
| 442 | 1 hunks, 1 lines changed |
|
442 | 1 hunks, 1 lines changed | |
| 443 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 |
|
443 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 | |
| 444 | 1 hunks, 1 lines changed |
|
444 | 1 hunks, 1 lines changed | |
| 445 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected |
|
445 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected | |
| 446 | % no |
|
446 | % no | |
| 447 | diff --git a/subdir/f1 b/subdir/f1 |
|
447 | diff --git a/subdir/f1 b/subdir/f1 | |
| 448 | 1 hunks, 1 lines changed |
|
448 | 1 hunks, 1 lines changed | |
| 449 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 |
|
449 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 | |
| 450 | 1 hunks, 1 lines changed |
|
450 | 1 hunks, 1 lines changed | |
| 451 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected |
|
451 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: response expected | |
| 452 | % f, quit |
|
452 | % f, quit | |
| 453 | diff --git a/subdir/f1 b/subdir/f1 |
|
453 | diff --git a/subdir/f1 b/subdir/f1 | |
| 454 | 1 hunks, 1 lines changed |
|
454 | 1 hunks, 1 lines changed | |
| 455 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 |
|
455 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 | |
| 456 | 1 hunks, 1 lines changed |
|
456 | 1 hunks, 1 lines changed | |
| 457 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: user quit |
|
457 | examine changes to 'subdir/f2'? [Ynsfdaq?] abort: user quit | |
| 458 | % s, all |
|
458 | % s, all | |
| 459 | diff --git a/subdir/f1 b/subdir/f1 |
|
459 | diff --git a/subdir/f1 b/subdir/f1 | |
| 460 | 1 hunks, 1 lines changed |
|
460 | 1 hunks, 1 lines changed | |
| 461 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 |
|
461 | examine changes to 'subdir/f1'? [Ynsfdaq?] diff --git a/subdir/f2 b/subdir/f2 | |
| 462 | 1 hunks, 1 lines changed |
|
462 | 1 hunks, 1 lines changed | |
| 463 | examine changes to 'subdir/f2'? [Ynsfdaq?] |
|
463 | examine changes to 'subdir/f2'? [Ynsfdaq?] | |
| 464 |
changeset: 20: |
|
464 | changeset: 20:d2d8c25276a8 | |
| 465 | tag: tip |
|
465 | tag: tip | |
| 466 | user: test |
|
466 | user: test | |
| 467 | date: Thu Jan 01 00:00:18 1970 +0000 |
|
467 | date: Thu Jan 01 00:00:18 1970 +0000 | |
| 468 | summary: x |
|
468 | summary: x | |
| 469 |
|
469 | |||
| 470 | diff -r f9e855cd9374 -r 094183e04b7c subdir/f2 |
|
470 | diff -r 25eb2a7694fb -r d2d8c25276a8 subdir/f2 | |
| 471 | --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000 |
|
471 | --- a/subdir/f2 Thu Jan 01 00:00:17 1970 +0000 | |
| 472 | +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000 |
|
472 | +++ b/subdir/f2 Thu Jan 01 00:00:18 1970 +0000 | |
| 473 | @@ -1,1 +1,2 @@ |
|
473 | @@ -1,1 +1,2 @@ | |
| 474 | b |
|
474 | b | |
| 475 | +b |
|
475 | +b | |
| 476 |
|
476 | |||
| 477 | % f |
|
477 | % f | |
| 478 | diff --git a/subdir/f1 b/subdir/f1 |
|
478 | diff --git a/subdir/f1 b/subdir/f1 | |
| 479 | 1 hunks, 1 lines changed |
|
479 | 1 hunks, 1 lines changed | |
| 480 | examine changes to 'subdir/f1'? [Ynsfdaq?] |
|
480 | examine changes to 'subdir/f1'? [Ynsfdaq?] | |
| 481 |
changeset: 21: |
|
481 | changeset: 21:1013f51ce32f | |
| 482 | tag: tip |
|
482 | tag: tip | |
| 483 | user: test |
|
483 | user: test | |
| 484 | date: Thu Jan 01 00:00:19 1970 +0000 |
|
484 | date: Thu Jan 01 00:00:19 1970 +0000 | |
| 485 | summary: y |
|
485 | summary: y | |
| 486 |
|
486 | |||
| 487 |
diff -r |
|
487 | diff -r d2d8c25276a8 -r 1013f51ce32f subdir/f1 | |
| 488 | --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000 |
|
488 | --- a/subdir/f1 Thu Jan 01 00:00:18 1970 +0000 | |
| 489 | +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000 |
|
489 | +++ b/subdir/f1 Thu Jan 01 00:00:19 1970 +0000 | |
| 490 | @@ -1,1 +1,2 @@ |
|
490 | @@ -1,1 +1,2 @@ | |
| 491 | a |
|
491 | a | |
| 492 | +a |
|
492 | +a | |
| 493 |
|
493 | |||
| 494 | % preserve chmod +x |
|
494 | % preserve chmod +x | |
| 495 | diff --git a/subdir/f1 b/subdir/f1 |
|
495 | diff --git a/subdir/f1 b/subdir/f1 | |
| 496 | old mode 100644 |
|
496 | old mode 100644 | |
| 497 | new mode 100755 |
|
497 | new mode 100755 | |
| 498 | 1 hunks, 1 lines changed |
|
498 | 1 hunks, 1 lines changed | |
| 499 | examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,2 +1,3 @@ |
|
499 | examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,2 +1,3 @@ | |
| 500 | a |
|
500 | a | |
| 501 | a |
|
501 | a | |
| 502 | +a |
|
502 | +a | |
| 503 | record this change to 'subdir/f1'? [Ynsfdaq?] |
|
503 | record this change to 'subdir/f1'? [Ynsfdaq?] | |
| 504 |
changeset: 22: |
|
504 | changeset: 22:5df857735621 | |
| 505 | tag: tip |
|
505 | tag: tip | |
| 506 | user: test |
|
506 | user: test | |
| 507 | date: Thu Jan 01 00:00:20 1970 +0000 |
|
507 | date: Thu Jan 01 00:00:20 1970 +0000 | |
| 508 | summary: z |
|
508 | summary: z | |
| 509 |
|
509 | |||
| 510 | diff --git a/subdir/f1 b/subdir/f1 |
|
510 | diff --git a/subdir/f1 b/subdir/f1 | |
| 511 | old mode 100644 |
|
511 | old mode 100644 | |
| 512 | new mode 100755 |
|
512 | new mode 100755 | |
| 513 | --- a/subdir/f1 |
|
513 | --- a/subdir/f1 | |
| 514 | +++ b/subdir/f1 |
|
514 | +++ b/subdir/f1 | |
| 515 | @@ -1,2 +1,3 @@ |
|
515 | @@ -1,2 +1,3 @@ | |
| 516 | a |
|
516 | a | |
| 517 | a |
|
517 | a | |
| 518 | +a |
|
518 | +a | |
| 519 |
|
519 | |||
| 520 | % preserve execute permission on original |
|
520 | % preserve execute permission on original | |
| 521 | diff --git a/subdir/f1 b/subdir/f1 |
|
521 | diff --git a/subdir/f1 b/subdir/f1 | |
| 522 | 1 hunks, 1 lines changed |
|
522 | 1 hunks, 1 lines changed | |
| 523 | examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,3 +1,4 @@ |
|
523 | examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -1,3 +1,4 @@ | |
| 524 | a |
|
524 | a | |
| 525 | a |
|
525 | a | |
| 526 | a |
|
526 | a | |
| 527 | +b |
|
527 | +b | |
| 528 | record this change to 'subdir/f1'? [Ynsfdaq?] |
|
528 | record this change to 'subdir/f1'? [Ynsfdaq?] | |
| 529 |
changeset: 23: |
|
529 | changeset: 23:a4ae36a78715 | |
| 530 | tag: tip |
|
530 | tag: tip | |
| 531 | user: test |
|
531 | user: test | |
| 532 | date: Thu Jan 01 00:00:21 1970 +0000 |
|
532 | date: Thu Jan 01 00:00:21 1970 +0000 | |
| 533 | summary: aa |
|
533 | summary: aa | |
| 534 |
|
534 | |||
| 535 | diff --git a/subdir/f1 b/subdir/f1 |
|
535 | diff --git a/subdir/f1 b/subdir/f1 | |
| 536 | --- a/subdir/f1 |
|
536 | --- a/subdir/f1 | |
| 537 | +++ b/subdir/f1 |
|
537 | +++ b/subdir/f1 | |
| 538 | @@ -1,3 +1,4 @@ |
|
538 | @@ -1,3 +1,4 @@ | |
| 539 | a |
|
539 | a | |
| 540 | a |
|
540 | a | |
| 541 | a |
|
541 | a | |
| 542 | +b |
|
542 | +b | |
| 543 |
|
543 | |||
| 544 | % preserve chmod -x |
|
544 | % preserve chmod -x | |
| 545 | diff --git a/subdir/f1 b/subdir/f1 |
|
545 | diff --git a/subdir/f1 b/subdir/f1 | |
| 546 | old mode 100755 |
|
546 | old mode 100755 | |
| 547 | new mode 100644 |
|
547 | new mode 100644 | |
| 548 | 1 hunks, 1 lines changed |
|
548 | 1 hunks, 1 lines changed | |
| 549 | examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -2,3 +2,4 @@ |
|
549 | examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -2,3 +2,4 @@ | |
| 550 | a |
|
550 | a | |
| 551 | a |
|
551 | a | |
| 552 | b |
|
552 | b | |
| 553 | +c |
|
553 | +c | |
| 554 | record this change to 'subdir/f1'? [Ynsfdaq?] |
|
554 | record this change to 'subdir/f1'? [Ynsfdaq?] | |
| 555 |
changeset: 24: |
|
555 | changeset: 24:1460f6e47966 | |
| 556 | tag: tip |
|
556 | tag: tip | |
| 557 | user: test |
|
557 | user: test | |
| 558 | date: Thu Jan 01 00:00:22 1970 +0000 |
|
558 | date: Thu Jan 01 00:00:22 1970 +0000 | |
| 559 | summary: ab |
|
559 | summary: ab | |
| 560 |
|
560 | |||
| 561 | diff --git a/subdir/f1 b/subdir/f1 |
|
561 | diff --git a/subdir/f1 b/subdir/f1 | |
| 562 | old mode 100755 |
|
562 | old mode 100755 | |
| 563 | new mode 100644 |
|
563 | new mode 100644 | |
| 564 | --- a/subdir/f1 |
|
564 | --- a/subdir/f1 | |
| 565 | +++ b/subdir/f1 |
|
565 | +++ b/subdir/f1 | |
| 566 | @@ -2,3 +2,4 @@ |
|
566 | @@ -2,3 +2,4 @@ | |
| 567 | a |
|
567 | a | |
| 568 | a |
|
568 | a | |
| 569 | b |
|
569 | b | |
| 570 | +c |
|
570 | +c | |
| 571 |
|
571 | |||
| 572 | % with win32ext |
|
572 | % with win32ext | |
| 573 | diff --git a/subdir/f1 b/subdir/f1 |
|
573 | diff --git a/subdir/f1 b/subdir/f1 | |
| 574 | 1 hunks, 1 lines changed |
|
574 | 1 hunks, 1 lines changed | |
| 575 | examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -3,3 +3,4 @@ |
|
575 | examine changes to 'subdir/f1'? [Ynsfdaq?] @@ -3,3 +3,4 @@ | |
| 576 | a |
|
576 | a | |
| 577 | b |
|
577 | b | |
| 578 | c |
|
578 | c | |
| 579 | +d |
|
579 | +d | |
| 580 | record this change to 'subdir/f1'? [Ynsfdaq?] |
|
580 | record this change to 'subdir/f1'? [Ynsfdaq?] | |
| 581 |
changeset: 25: |
|
581 | changeset: 25:5bacc1f6e9cf | |
| 582 | tag: tip |
|
582 | tag: tip | |
| 583 | user: test |
|
583 | user: test | |
| 584 | date: Thu Jan 01 00:00:23 1970 +0000 |
|
584 | date: Thu Jan 01 00:00:23 1970 +0000 | |
| 585 | summary: w1 |
|
585 | summary: w1 | |
| 586 |
|
586 | |||
| 587 | diff -r 8fd83ff53ce6 -r 49b3838dc9e7 subdir/f1 |
|
587 | diff -r 1460f6e47966 -r 5bacc1f6e9cf subdir/f1 | |
| 588 | --- a/subdir/f1 Thu Jan 01 00:00:22 1970 +0000 |
|
588 | --- a/subdir/f1 Thu Jan 01 00:00:22 1970 +0000 | |
| 589 | +++ b/subdir/f1 Thu Jan 01 00:00:23 1970 +0000 |
|
589 | +++ b/subdir/f1 Thu Jan 01 00:00:23 1970 +0000 | |
| 590 | @@ -3,3 +3,4 @@ |
|
590 | @@ -3,3 +3,4 @@ | |
| 591 | a |
|
591 | a | |
| 592 | b |
|
592 | b | |
| 593 | c |
|
593 | c | |
| 594 | +d |
|
594 | +d | |
| 595 |
|
595 | |||
| @@ -1,82 +1,82 b'' | |||||
| 1 | adding a/a |
|
1 | adding a/a | |
| 2 | adding a/b |
|
2 | adding a/b | |
| 3 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 4 | moving a/a to b/a |
|
4 | moving a/a to b/a | |
| 5 | moving a/b to b/b |
|
5 | moving a/b to b/b | |
| 6 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
6 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 7 | created new head |
|
7 | created new head | |
| 8 | searching for copies back to rev 1 |
|
8 | searching for copies back to rev 1 | |
| 9 | unmatched files in local: |
|
9 | unmatched files in local: | |
| 10 | a/c |
|
10 | a/c | |
| 11 | a/d |
|
11 | a/d | |
| 12 | unmatched files in other: |
|
12 | unmatched files in other: | |
| 13 | b/a |
|
13 | b/a | |
| 14 | b/b |
|
14 | b/b | |
| 15 | all copies found (* = to merge, ! = divergent): |
|
15 | all copies found (* = to merge, ! = divergent): | |
| 16 | b/a -> a/a |
|
16 | b/a -> a/a | |
| 17 | b/b -> a/b |
|
17 | b/b -> a/b | |
| 18 | checking for directory renames |
|
18 | checking for directory renames | |
| 19 | dir a/ -> b/ |
|
19 | dir a/ -> b/ | |
| 20 | file a/c -> b/c |
|
20 | file a/c -> b/c | |
| 21 | file a/d -> b/d |
|
21 | file a/d -> b/d | |
| 22 | resolving manifests |
|
22 | resolving manifests | |
| 23 | overwrite None partial False |
|
23 | overwrite None partial False | |
| 24 |
ancestor f9b20c0d4c51 local ce36d17b18fb+ remote |
|
24 | ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740 | |
| 25 | a/d: remote renamed directory to b/d -> d |
|
25 | a/d: remote renamed directory to b/d -> d | |
| 26 | a/c: remote renamed directory to b/c -> d |
|
26 | a/c: remote renamed directory to b/c -> d | |
| 27 | a/b: other deleted -> r |
|
27 | a/b: other deleted -> r | |
| 28 | a/a: other deleted -> r |
|
28 | a/a: other deleted -> r | |
| 29 | b/a: remote created -> g |
|
29 | b/a: remote created -> g | |
| 30 | b/b: remote created -> g |
|
30 | b/b: remote created -> g | |
| 31 | update: a/a 1/6 files (16.67%) |
|
31 | update: a/a 1/6 files (16.67%) | |
| 32 | removing a/a |
|
32 | removing a/a | |
| 33 | update: a/b 2/6 files (33.33%) |
|
33 | update: a/b 2/6 files (33.33%) | |
| 34 | removing a/b |
|
34 | removing a/b | |
| 35 | update: a/c 3/6 files (50.00%) |
|
35 | update: a/c 3/6 files (50.00%) | |
| 36 | moving a/c to b/c |
|
36 | moving a/c to b/c | |
| 37 | update: a/d 4/6 files (66.67%) |
|
37 | update: a/d 4/6 files (66.67%) | |
| 38 | moving a/d to b/d |
|
38 | moving a/d to b/d | |
| 39 | update: b/a 5/6 files (83.33%) |
|
39 | update: b/a 5/6 files (83.33%) | |
| 40 | getting b/a |
|
40 | getting b/a | |
| 41 | update: b/b 6/6 files (100.00%) |
|
41 | update: b/b 6/6 files (100.00%) | |
| 42 | getting b/b |
|
42 | getting b/b | |
| 43 | 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
43 | 4 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 44 | (branch merge, don't forget to commit) |
|
44 | (branch merge, don't forget to commit) | |
| 45 | a/* b/a b/b b/c b/d |
|
45 | a/* b/a b/b b/c b/d | |
| 46 | M b/a |
|
46 | M b/a | |
| 47 | M b/b |
|
47 | M b/b | |
| 48 | A b/c |
|
48 | A b/c | |
| 49 | a/c |
|
49 | a/c | |
| 50 | R a/a |
|
50 | R a/a | |
| 51 | R a/b |
|
51 | R a/b | |
| 52 | R a/c |
|
52 | R a/c | |
| 53 | ? b/d |
|
53 | ? b/d | |
| 54 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |
|
54 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 | |
| 55 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
55 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 56 | searching for copies back to rev 1 |
|
56 | searching for copies back to rev 1 | |
| 57 | unmatched files in local: |
|
57 | unmatched files in local: | |
| 58 | b/a |
|
58 | b/a | |
| 59 | b/b |
|
59 | b/b | |
| 60 | b/d |
|
60 | b/d | |
| 61 | unmatched files in other: |
|
61 | unmatched files in other: | |
| 62 | a/c |
|
62 | a/c | |
| 63 | all copies found (* = to merge, ! = divergent): |
|
63 | all copies found (* = to merge, ! = divergent): | |
| 64 | b/a -> a/a |
|
64 | b/a -> a/a | |
| 65 | b/b -> a/b |
|
65 | b/b -> a/b | |
| 66 | checking for directory renames |
|
66 | checking for directory renames | |
| 67 | dir a/ -> b/ |
|
67 | dir a/ -> b/ | |
| 68 | file a/c -> b/c |
|
68 | file a/c -> b/c | |
| 69 | resolving manifests |
|
69 | resolving manifests | |
| 70 | overwrite None partial False |
|
70 | overwrite None partial False | |
| 71 |
ancestor f9b20c0d4c51 local |
|
71 | ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb | |
| 72 | None: local renamed directory to b/c -> d |
|
72 | None: local renamed directory to b/c -> d | |
| 73 | update:None 1/1 files (100.00%) |
|
73 | update:None 1/1 files (100.00%) | |
| 74 | getting a/c to b/c |
|
74 | getting a/c to b/c | |
| 75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 76 | (branch merge, don't forget to commit) |
|
76 | (branch merge, don't forget to commit) | |
| 77 | a/* b/a b/b b/c b/d |
|
77 | a/* b/a b/b b/c b/d | |
| 78 | A b/c |
|
78 | A b/c | |
| 79 | a/c |
|
79 | a/c | |
| 80 | ? b/d |
|
80 | ? b/d | |
| 81 | created new head |
|
81 | created new head | |
| 82 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |
|
82 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 | |
| @@ -1,46 +1,46 b'' | |||||
| 1 | checkout |
|
1 | checkout | |
| 2 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
2 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 3 | created new head |
|
3 | created new head | |
| 4 | merge |
|
4 | merge | |
| 5 | searching for copies back to rev 1 |
|
5 | searching for copies back to rev 1 | |
| 6 | unmatched files in local: |
|
6 | unmatched files in local: | |
| 7 | c2 |
|
7 | c2 | |
| 8 | unmatched files in other: |
|
8 | unmatched files in other: | |
| 9 | b |
|
9 | b | |
| 10 | b2 |
|
10 | b2 | |
| 11 | all copies found (* = to merge, ! = divergent): |
|
11 | all copies found (* = to merge, ! = divergent): | |
| 12 | c2 -> a2 ! |
|
12 | c2 -> a2 ! | |
| 13 | b -> a * |
|
13 | b -> a * | |
| 14 | b2 -> a2 ! |
|
14 | b2 -> a2 ! | |
| 15 | checking for directory renames |
|
15 | checking for directory renames | |
| 16 | a2: divergent renames -> dr |
|
16 | a2: divergent renames -> dr | |
| 17 | resolving manifests |
|
17 | resolving manifests | |
| 18 | overwrite None partial False |
|
18 | overwrite None partial False | |
| 19 |
ancestor af1939970a1c local |
|
19 | ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c | |
| 20 | a: remote moved to b -> m |
|
20 | a: remote moved to b -> m | |
| 21 | b2: remote created -> g |
|
21 | b2: remote created -> g | |
| 22 | preserving a for resolve of b |
|
22 | preserving a for resolve of b | |
| 23 | removing a |
|
23 | removing a | |
| 24 | update: a 1/3 files (33.33%) |
|
24 | update: a 1/3 files (33.33%) | |
| 25 | picked tool 'internal:merge' for b (binary False symlink False) |
|
25 | picked tool 'internal:merge' for b (binary False symlink False) | |
| 26 | merging a and b to b |
|
26 | merging a and b to b | |
| 27 |
my b@ |
|
27 | my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c | |
| 28 | premerge successful |
|
28 | premerge successful | |
| 29 | update: a2 2/3 files (66.67%) |
|
29 | update: a2 2/3 files (66.67%) | |
| 30 | warning: detected divergent renames of a2 to: |
|
30 | warning: detected divergent renames of a2 to: | |
| 31 | c2 |
|
31 | c2 | |
| 32 | b2 |
|
32 | b2 | |
| 33 | update: b2 3/3 files (100.00%) |
|
33 | update: b2 3/3 files (100.00%) | |
| 34 | getting b2 |
|
34 | getting b2 | |
| 35 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
35 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 36 | (branch merge, don't forget to commit) |
|
36 | (branch merge, don't forget to commit) | |
| 37 | M b |
|
37 | M b | |
| 38 | a |
|
38 | a | |
| 39 | M b2 |
|
39 | M b2 | |
| 40 | R a |
|
40 | R a | |
| 41 | C c2 |
|
41 | C c2 | |
| 42 | blahblah |
|
42 | blahblah | |
| 43 | rev offset length base linkrev nodeid p1 p2 |
|
43 | rev offset length base linkrev nodeid p1 p2 | |
| 44 |
0 0 67 0 1 |
|
44 | 0 0 67 0 1 57eacc201a7f 000000000000 000000000000 | |
| 45 |
1 67 72 1 3 |
|
45 | 1 67 72 1 3 4727ba907962 000000000000 57eacc201a7f | |
| 46 | b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 |
|
46 | b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 | |
| @@ -1,651 +1,651 b'' | |||||
| 1 | created new head |
|
1 | created new head | |
| 2 | -------------- |
|
2 | -------------- | |
| 3 | test L:up a R:nc a b W: - 1 get local a to b |
|
3 | test L:up a R:nc a b W: - 1 get local a to b | |
| 4 | -------------- |
|
4 | -------------- | |
| 5 | searching for copies back to rev 1 |
|
5 | searching for copies back to rev 1 | |
| 6 | unmatched files in other: |
|
6 | unmatched files in other: | |
| 7 | b |
|
7 | b | |
| 8 | all copies found (* = to merge, ! = divergent): |
|
8 | all copies found (* = to merge, ! = divergent): | |
| 9 | b -> a * |
|
9 | b -> a * | |
| 10 | checking for directory renames |
|
10 | checking for directory renames | |
| 11 | resolving manifests |
|
11 | resolving manifests | |
| 12 | overwrite None partial False |
|
12 | overwrite None partial False | |
| 13 |
ancestor 924404dff337 local e300d1c794ec+ remote |
|
13 | ancestor 924404dff337 local e300d1c794ec+ remote 4ce40f5aca24 | |
| 14 | rev: versions differ -> m |
|
14 | rev: versions differ -> m | |
| 15 | a: remote copied to b -> m |
|
15 | a: remote copied to b -> m | |
| 16 | preserving a for resolve of b |
|
16 | preserving a for resolve of b | |
| 17 | preserving rev for resolve of rev |
|
17 | preserving rev for resolve of rev | |
| 18 | update: a 1/2 files (50.00%) |
|
18 | update: a 1/2 files (50.00%) | |
| 19 | picked tool 'python ../merge' for b (binary False symlink False) |
|
19 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 20 | merging a and b to b |
|
20 | merging a and b to b | |
| 21 |
my b@e300d1c794ec+ other b@ |
|
21 | my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 | |
| 22 | premerge successful |
|
22 | premerge successful | |
| 23 | update: rev 2/2 files (100.00%) |
|
23 | update: rev 2/2 files (100.00%) | |
| 24 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
24 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 25 | merging rev |
|
25 | merging rev | |
| 26 |
my rev@e300d1c794ec+ other rev@ |
|
26 | my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
| 27 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
27 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 28 | (branch merge, don't forget to commit) |
|
28 | (branch merge, don't forget to commit) | |
| 29 | -------------- |
|
29 | -------------- | |
| 30 | M b |
|
30 | M b | |
| 31 | a |
|
31 | a | |
| 32 | C a |
|
32 | C a | |
| 33 | -------------- |
|
33 | -------------- | |
| 34 |
|
34 | |||
| 35 | created new head |
|
35 | created new head | |
| 36 | -------------- |
|
36 | -------------- | |
| 37 | test L:nc a b R:up a W: - 2 get rem change to a and b |
|
37 | test L:nc a b R:up a W: - 2 get rem change to a and b | |
| 38 | -------------- |
|
38 | -------------- | |
| 39 | searching for copies back to rev 1 |
|
39 | searching for copies back to rev 1 | |
| 40 | unmatched files in local: |
|
40 | unmatched files in local: | |
| 41 | b |
|
41 | b | |
| 42 | all copies found (* = to merge, ! = divergent): |
|
42 | all copies found (* = to merge, ! = divergent): | |
| 43 | b -> a * |
|
43 | b -> a * | |
| 44 | checking for directory renames |
|
44 | checking for directory renames | |
| 45 | resolving manifests |
|
45 | resolving manifests | |
| 46 | overwrite None partial False |
|
46 | overwrite None partial False | |
| 47 |
ancestor 924404dff337 local |
|
47 | ancestor 924404dff337 local 86a2aa42fc76+ remote f4db7e329e71 | |
| 48 | a: remote is newer -> g |
|
48 | a: remote is newer -> g | |
| 49 | b: local copied/moved to a -> m |
|
49 | b: local copied/moved to a -> m | |
| 50 | rev: versions differ -> m |
|
50 | rev: versions differ -> m | |
| 51 | preserving b for resolve of b |
|
51 | preserving b for resolve of b | |
| 52 | preserving rev for resolve of rev |
|
52 | preserving rev for resolve of rev | |
| 53 | update: a 1/3 files (33.33%) |
|
53 | update: a 1/3 files (33.33%) | |
| 54 | getting a |
|
54 | getting a | |
| 55 | update: b 2/3 files (66.67%) |
|
55 | update: b 2/3 files (66.67%) | |
| 56 | picked tool 'python ../merge' for b (binary False symlink False) |
|
56 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 57 | merging b and a to b |
|
57 | merging b and a to b | |
| 58 |
my b@ |
|
58 | my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 | |
| 59 | premerge successful |
|
59 | premerge successful | |
| 60 | update: rev 3/3 files (100.00%) |
|
60 | update: rev 3/3 files (100.00%) | |
| 61 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
61 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 62 | merging rev |
|
62 | merging rev | |
| 63 |
my rev@ |
|
63 | my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
| 64 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
64 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 65 | (branch merge, don't forget to commit) |
|
65 | (branch merge, don't forget to commit) | |
| 66 | -------------- |
|
66 | -------------- | |
| 67 | M a |
|
67 | M a | |
| 68 | M b |
|
68 | M b | |
| 69 | a |
|
69 | a | |
| 70 | -------------- |
|
70 | -------------- | |
| 71 |
|
71 | |||
| 72 | created new head |
|
72 | created new head | |
| 73 | -------------- |
|
73 | -------------- | |
| 74 | test L:up a R:nm a b W: - 3 get local a change to b, remove a |
|
74 | test L:up a R:nm a b W: - 3 get local a change to b, remove a | |
| 75 | -------------- |
|
75 | -------------- | |
| 76 | searching for copies back to rev 1 |
|
76 | searching for copies back to rev 1 | |
| 77 | unmatched files in other: |
|
77 | unmatched files in other: | |
| 78 | b |
|
78 | b | |
| 79 | all copies found (* = to merge, ! = divergent): |
|
79 | all copies found (* = to merge, ! = divergent): | |
| 80 | b -> a * |
|
80 | b -> a * | |
| 81 | checking for directory renames |
|
81 | checking for directory renames | |
| 82 | resolving manifests |
|
82 | resolving manifests | |
| 83 | overwrite None partial False |
|
83 | overwrite None partial False | |
| 84 |
ancestor 924404dff337 local e300d1c794ec+ remote |
|
84 | ancestor 924404dff337 local e300d1c794ec+ remote bdb19105162a | |
| 85 | rev: versions differ -> m |
|
85 | rev: versions differ -> m | |
| 86 | a: remote moved to b -> m |
|
86 | a: remote moved to b -> m | |
| 87 | preserving a for resolve of b |
|
87 | preserving a for resolve of b | |
| 88 | preserving rev for resolve of rev |
|
88 | preserving rev for resolve of rev | |
| 89 | removing a |
|
89 | removing a | |
| 90 | update: a 1/2 files (50.00%) |
|
90 | update: a 1/2 files (50.00%) | |
| 91 | picked tool 'python ../merge' for b (binary False symlink False) |
|
91 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 92 | merging a and b to b |
|
92 | merging a and b to b | |
| 93 |
my b@e300d1c794ec+ other b@ |
|
93 | my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 | |
| 94 | premerge successful |
|
94 | premerge successful | |
| 95 | update: rev 2/2 files (100.00%) |
|
95 | update: rev 2/2 files (100.00%) | |
| 96 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
96 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 97 | merging rev |
|
97 | merging rev | |
| 98 |
my rev@e300d1c794ec+ other rev@ |
|
98 | my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 | |
| 99 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
99 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 100 | (branch merge, don't forget to commit) |
|
100 | (branch merge, don't forget to commit) | |
| 101 | -------------- |
|
101 | -------------- | |
| 102 | M b |
|
102 | M b | |
| 103 | a |
|
103 | a | |
| 104 | -------------- |
|
104 | -------------- | |
| 105 |
|
105 | |||
| 106 | created new head |
|
106 | created new head | |
| 107 | -------------- |
|
107 | -------------- | |
| 108 | test L:nm a b R:up a W: - 4 get remote change to b |
|
108 | test L:nm a b R:up a W: - 4 get remote change to b | |
| 109 | -------------- |
|
109 | -------------- | |
| 110 | searching for copies back to rev 1 |
|
110 | searching for copies back to rev 1 | |
| 111 | unmatched files in local: |
|
111 | unmatched files in local: | |
| 112 | b |
|
112 | b | |
| 113 | all copies found (* = to merge, ! = divergent): |
|
113 | all copies found (* = to merge, ! = divergent): | |
| 114 | b -> a * |
|
114 | b -> a * | |
| 115 | checking for directory renames |
|
115 | checking for directory renames | |
| 116 | resolving manifests |
|
116 | resolving manifests | |
| 117 | overwrite None partial False |
|
117 | overwrite None partial False | |
| 118 |
ancestor 924404dff337 local |
|
118 | ancestor 924404dff337 local 02963e448370+ remote f4db7e329e71 | |
| 119 | b: local copied/moved to a -> m |
|
119 | b: local copied/moved to a -> m | |
| 120 | rev: versions differ -> m |
|
120 | rev: versions differ -> m | |
| 121 | preserving b for resolve of b |
|
121 | preserving b for resolve of b | |
| 122 | preserving rev for resolve of rev |
|
122 | preserving rev for resolve of rev | |
| 123 | update: b 1/2 files (50.00%) |
|
123 | update: b 1/2 files (50.00%) | |
| 124 | picked tool 'python ../merge' for b (binary False symlink False) |
|
124 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 125 | merging b and a to b |
|
125 | merging b and a to b | |
| 126 |
my b@ |
|
126 | my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 | |
| 127 | premerge successful |
|
127 | premerge successful | |
| 128 | update: rev 2/2 files (100.00%) |
|
128 | update: rev 2/2 files (100.00%) | |
| 129 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
129 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 130 | merging rev |
|
130 | merging rev | |
| 131 |
my rev@ |
|
131 | my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
| 132 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
132 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 133 | (branch merge, don't forget to commit) |
|
133 | (branch merge, don't forget to commit) | |
| 134 | -------------- |
|
134 | -------------- | |
| 135 | M b |
|
135 | M b | |
| 136 | a |
|
136 | a | |
| 137 | -------------- |
|
137 | -------------- | |
| 138 |
|
138 | |||
| 139 | created new head |
|
139 | created new head | |
| 140 | -------------- |
|
140 | -------------- | |
| 141 | test L: R:nc a b W: - 5 get b |
|
141 | test L: R:nc a b W: - 5 get b | |
| 142 | -------------- |
|
142 | -------------- | |
| 143 | searching for copies back to rev 1 |
|
143 | searching for copies back to rev 1 | |
| 144 | unmatched files in other: |
|
144 | unmatched files in other: | |
| 145 | b |
|
145 | b | |
| 146 | all copies found (* = to merge, ! = divergent): |
|
146 | all copies found (* = to merge, ! = divergent): | |
| 147 | b -> a |
|
147 | b -> a | |
| 148 | checking for directory renames |
|
148 | checking for directory renames | |
| 149 | resolving manifests |
|
149 | resolving manifests | |
| 150 | overwrite None partial False |
|
150 | overwrite None partial False | |
| 151 |
ancestor 924404dff337 local 94b33a1b7f2d+ remote |
|
151 | ancestor 924404dff337 local 94b33a1b7f2d+ remote 4ce40f5aca24 | |
| 152 | rev: versions differ -> m |
|
152 | rev: versions differ -> m | |
| 153 | b: remote created -> g |
|
153 | b: remote created -> g | |
| 154 | preserving rev for resolve of rev |
|
154 | preserving rev for resolve of rev | |
| 155 | update: b 1/2 files (50.00%) |
|
155 | update: b 1/2 files (50.00%) | |
| 156 | getting b |
|
156 | getting b | |
| 157 | update: rev 2/2 files (100.00%) |
|
157 | update: rev 2/2 files (100.00%) | |
| 158 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
158 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 159 | merging rev |
|
159 | merging rev | |
| 160 |
my rev@94b33a1b7f2d+ other rev@ |
|
160 | my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
| 161 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
161 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 162 | (branch merge, don't forget to commit) |
|
162 | (branch merge, don't forget to commit) | |
| 163 | -------------- |
|
163 | -------------- | |
| 164 | M b |
|
164 | M b | |
| 165 | C a |
|
165 | C a | |
| 166 | -------------- |
|
166 | -------------- | |
| 167 |
|
167 | |||
| 168 | created new head |
|
168 | created new head | |
| 169 | -------------- |
|
169 | -------------- | |
| 170 | test L:nc a b R: W: - 6 nothing |
|
170 | test L:nc a b R: W: - 6 nothing | |
| 171 | -------------- |
|
171 | -------------- | |
| 172 | searching for copies back to rev 1 |
|
172 | searching for copies back to rev 1 | |
| 173 | unmatched files in local: |
|
173 | unmatched files in local: | |
| 174 | b |
|
174 | b | |
| 175 | all copies found (* = to merge, ! = divergent): |
|
175 | all copies found (* = to merge, ! = divergent): | |
| 176 | b -> a |
|
176 | b -> a | |
| 177 | checking for directory renames |
|
177 | checking for directory renames | |
| 178 | resolving manifests |
|
178 | resolving manifests | |
| 179 | overwrite None partial False |
|
179 | overwrite None partial False | |
| 180 |
ancestor 924404dff337 local |
|
180 | ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336 | |
| 181 | rev: versions differ -> m |
|
181 | rev: versions differ -> m | |
| 182 | preserving rev for resolve of rev |
|
182 | preserving rev for resolve of rev | |
| 183 | update: rev 1/1 files (100.00%) |
|
183 | update: rev 1/1 files (100.00%) | |
| 184 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
184 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 185 | merging rev |
|
185 | merging rev | |
| 186 |
my rev@ |
|
186 | my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 | |
| 187 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
187 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 188 | (branch merge, don't forget to commit) |
|
188 | (branch merge, don't forget to commit) | |
| 189 | -------------- |
|
189 | -------------- | |
| 190 | C a |
|
190 | C a | |
| 191 | C b |
|
191 | C b | |
| 192 | -------------- |
|
192 | -------------- | |
| 193 |
|
193 | |||
| 194 | created new head |
|
194 | created new head | |
| 195 | -------------- |
|
195 | -------------- | |
| 196 | test L: R:nm a b W: - 7 get b |
|
196 | test L: R:nm a b W: - 7 get b | |
| 197 | -------------- |
|
197 | -------------- | |
| 198 | searching for copies back to rev 1 |
|
198 | searching for copies back to rev 1 | |
| 199 | unmatched files in other: |
|
199 | unmatched files in other: | |
| 200 | b |
|
200 | b | |
| 201 | all copies found (* = to merge, ! = divergent): |
|
201 | all copies found (* = to merge, ! = divergent): | |
| 202 | b -> a |
|
202 | b -> a | |
| 203 | checking for directory renames |
|
203 | checking for directory renames | |
| 204 | resolving manifests |
|
204 | resolving manifests | |
| 205 | overwrite None partial False |
|
205 | overwrite None partial False | |
| 206 |
ancestor 924404dff337 local 94b33a1b7f2d+ remote |
|
206 | ancestor 924404dff337 local 94b33a1b7f2d+ remote bdb19105162a | |
| 207 | a: other deleted -> r |
|
207 | a: other deleted -> r | |
| 208 | rev: versions differ -> m |
|
208 | rev: versions differ -> m | |
| 209 | b: remote created -> g |
|
209 | b: remote created -> g | |
| 210 | preserving rev for resolve of rev |
|
210 | preserving rev for resolve of rev | |
| 211 | update: a 1/3 files (33.33%) |
|
211 | update: a 1/3 files (33.33%) | |
| 212 | removing a |
|
212 | removing a | |
| 213 | update: b 2/3 files (66.67%) |
|
213 | update: b 2/3 files (66.67%) | |
| 214 | getting b |
|
214 | getting b | |
| 215 | update: rev 3/3 files (100.00%) |
|
215 | update: rev 3/3 files (100.00%) | |
| 216 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
216 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 217 | merging rev |
|
217 | merging rev | |
| 218 |
my rev@94b33a1b7f2d+ other rev@ |
|
218 | my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 | |
| 219 | 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
|
219 | 1 files updated, 1 files merged, 1 files removed, 0 files unresolved | |
| 220 | (branch merge, don't forget to commit) |
|
220 | (branch merge, don't forget to commit) | |
| 221 | -------------- |
|
221 | -------------- | |
| 222 | M b |
|
222 | M b | |
| 223 | -------------- |
|
223 | -------------- | |
| 224 |
|
224 | |||
| 225 | created new head |
|
225 | created new head | |
| 226 | -------------- |
|
226 | -------------- | |
| 227 | test L:nm a b R: W: - 8 nothing |
|
227 | test L:nm a b R: W: - 8 nothing | |
| 228 | -------------- |
|
228 | -------------- | |
| 229 | searching for copies back to rev 1 |
|
229 | searching for copies back to rev 1 | |
| 230 | unmatched files in local: |
|
230 | unmatched files in local: | |
| 231 | b |
|
231 | b | |
| 232 | all copies found (* = to merge, ! = divergent): |
|
232 | all copies found (* = to merge, ! = divergent): | |
| 233 | b -> a |
|
233 | b -> a | |
| 234 | checking for directory renames |
|
234 | checking for directory renames | |
| 235 | resolving manifests |
|
235 | resolving manifests | |
| 236 | overwrite None partial False |
|
236 | overwrite None partial False | |
| 237 |
ancestor 924404dff337 local |
|
237 | ancestor 924404dff337 local 02963e448370+ remote 97c705ade336 | |
| 238 | rev: versions differ -> m |
|
238 | rev: versions differ -> m | |
| 239 | preserving rev for resolve of rev |
|
239 | preserving rev for resolve of rev | |
| 240 | update: rev 1/1 files (100.00%) |
|
240 | update: rev 1/1 files (100.00%) | |
| 241 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
241 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 242 | merging rev |
|
242 | merging rev | |
| 243 |
my rev@ |
|
243 | my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 | |
| 244 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
244 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 245 | (branch merge, don't forget to commit) |
|
245 | (branch merge, don't forget to commit) | |
| 246 | -------------- |
|
246 | -------------- | |
| 247 | C b |
|
247 | C b | |
| 248 | -------------- |
|
248 | -------------- | |
| 249 |
|
249 | |||
| 250 | created new head |
|
250 | created new head | |
| 251 | -------------- |
|
251 | -------------- | |
| 252 | test L:um a b R:um a b W: - 9 do merge with ancestor in a |
|
252 | test L:um a b R:um a b W: - 9 do merge with ancestor in a | |
| 253 | -------------- |
|
253 | -------------- | |
| 254 | searching for copies back to rev 1 |
|
254 | searching for copies back to rev 1 | |
| 255 | resolving manifests |
|
255 | resolving manifests | |
| 256 | overwrite None partial False |
|
256 | overwrite None partial False | |
| 257 |
ancestor 924404dff337 local |
|
257 | ancestor 924404dff337 local 62e7bf090eba+ remote 49b6d8032493 | |
| 258 | b: versions differ -> m |
|
258 | b: versions differ -> m | |
| 259 | rev: versions differ -> m |
|
259 | rev: versions differ -> m | |
| 260 | preserving b for resolve of b |
|
260 | preserving b for resolve of b | |
| 261 | preserving rev for resolve of rev |
|
261 | preserving rev for resolve of rev | |
| 262 | update: b 1/2 files (50.00%) |
|
262 | update: b 1/2 files (50.00%) | |
| 263 | picked tool 'python ../merge' for b (binary False symlink False) |
|
263 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 264 | merging b |
|
264 | merging b | |
| 265 |
my b@ |
|
265 | my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 | |
| 266 | update: rev 2/2 files (100.00%) |
|
266 | update: rev 2/2 files (100.00%) | |
| 267 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
267 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 268 | merging rev |
|
268 | merging rev | |
| 269 |
my rev@ |
|
269 | my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 | |
| 270 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
270 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 271 | (branch merge, don't forget to commit) |
|
271 | (branch merge, don't forget to commit) | |
| 272 | -------------- |
|
272 | -------------- | |
| 273 | M b |
|
273 | M b | |
| 274 | -------------- |
|
274 | -------------- | |
| 275 |
|
275 | |||
| 276 | created new head |
|
276 | created new head | |
| 277 | -------------- |
|
277 | -------------- | |
| 278 | test L:nm a b R:nm a c W: - 11 get c, keep b |
|
278 | test L:nm a b R:nm a c W: - 11 get c, keep b | |
| 279 | -------------- |
|
279 | -------------- | |
| 280 | searching for copies back to rev 1 |
|
280 | searching for copies back to rev 1 | |
| 281 | unmatched files in local: |
|
281 | unmatched files in local: | |
| 282 | b |
|
282 | b | |
| 283 | unmatched files in other: |
|
283 | unmatched files in other: | |
| 284 | c |
|
284 | c | |
| 285 | all copies found (* = to merge, ! = divergent): |
|
285 | all copies found (* = to merge, ! = divergent): | |
| 286 | c -> a ! |
|
286 | c -> a ! | |
| 287 | b -> a ! |
|
287 | b -> a ! | |
| 288 | checking for directory renames |
|
288 | checking for directory renames | |
| 289 | a: divergent renames -> dr |
|
289 | a: divergent renames -> dr | |
| 290 | resolving manifests |
|
290 | resolving manifests | |
| 291 | overwrite None partial False |
|
291 | overwrite None partial False | |
| 292 |
ancestor 924404dff337 local |
|
292 | ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e | |
| 293 | rev: versions differ -> m |
|
293 | rev: versions differ -> m | |
| 294 | c: remote created -> g |
|
294 | c: remote created -> g | |
| 295 | preserving rev for resolve of rev |
|
295 | preserving rev for resolve of rev | |
| 296 | update: a 1/3 files (33.33%) |
|
296 | update: a 1/3 files (33.33%) | |
| 297 | warning: detected divergent renames of a to: |
|
297 | warning: detected divergent renames of a to: | |
| 298 | b |
|
298 | b | |
| 299 | c |
|
299 | c | |
| 300 | update: c 2/3 files (66.67%) |
|
300 | update: c 2/3 files (66.67%) | |
| 301 | getting c |
|
301 | getting c | |
| 302 | update: rev 3/3 files (100.00%) |
|
302 | update: rev 3/3 files (100.00%) | |
| 303 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
303 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 304 | merging rev |
|
304 | merging rev | |
| 305 |
my rev@ |
|
305 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | |
| 306 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
306 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 307 | (branch merge, don't forget to commit) |
|
307 | (branch merge, don't forget to commit) | |
| 308 | -------------- |
|
308 | -------------- | |
| 309 | M c |
|
309 | M c | |
| 310 | C b |
|
310 | C b | |
| 311 | -------------- |
|
311 | -------------- | |
| 312 |
|
312 | |||
| 313 | created new head |
|
313 | created new head | |
| 314 | -------------- |
|
314 | -------------- | |
| 315 | test L:nc a b R:up b W: - 12 merge b no ancestor |
|
315 | test L:nc a b R:up b W: - 12 merge b no ancestor | |
| 316 | -------------- |
|
316 | -------------- | |
| 317 | searching for copies back to rev 1 |
|
317 | searching for copies back to rev 1 | |
| 318 | resolving manifests |
|
318 | resolving manifests | |
| 319 | overwrite None partial False |
|
319 | overwrite None partial False | |
| 320 |
ancestor 924404dff337 local |
|
320 | ancestor 924404dff337 local 86a2aa42fc76+ remote af30c7647fc7 | |
| 321 | b: versions differ -> m |
|
321 | b: versions differ -> m | |
| 322 | rev: versions differ -> m |
|
322 | rev: versions differ -> m | |
| 323 | preserving b for resolve of b |
|
323 | preserving b for resolve of b | |
| 324 | preserving rev for resolve of rev |
|
324 | preserving rev for resolve of rev | |
| 325 | update: b 1/2 files (50.00%) |
|
325 | update: b 1/2 files (50.00%) | |
| 326 | picked tool 'python ../merge' for b (binary False symlink False) |
|
326 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 327 | merging b |
|
327 | merging b | |
| 328 |
my b@ |
|
328 | my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 | |
| 329 | update: rev 2/2 files (100.00%) |
|
329 | update: rev 2/2 files (100.00%) | |
| 330 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
330 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 331 | merging rev |
|
331 | merging rev | |
| 332 |
my rev@ |
|
332 | my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 | |
| 333 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
333 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 334 | (branch merge, don't forget to commit) |
|
334 | (branch merge, don't forget to commit) | |
| 335 | -------------- |
|
335 | -------------- | |
| 336 | M b |
|
336 | M b | |
| 337 | C a |
|
337 | C a | |
| 338 | -------------- |
|
338 | -------------- | |
| 339 |
|
339 | |||
| 340 | created new head |
|
340 | created new head | |
| 341 | -------------- |
|
341 | -------------- | |
| 342 | test L:up b R:nm a b W: - 13 merge b no ancestor |
|
342 | test L:up b R:nm a b W: - 13 merge b no ancestor | |
| 343 | -------------- |
|
343 | -------------- | |
| 344 | searching for copies back to rev 1 |
|
344 | searching for copies back to rev 1 | |
| 345 | resolving manifests |
|
345 | resolving manifests | |
| 346 | overwrite None partial False |
|
346 | overwrite None partial False | |
| 347 |
ancestor 924404dff337 local 59318016310c+ remote |
|
347 | ancestor 924404dff337 local 59318016310c+ remote bdb19105162a | |
| 348 | a: other deleted -> r |
|
348 | a: other deleted -> r | |
| 349 | b: versions differ -> m |
|
349 | b: versions differ -> m | |
| 350 | rev: versions differ -> m |
|
350 | rev: versions differ -> m | |
| 351 | preserving b for resolve of b |
|
351 | preserving b for resolve of b | |
| 352 | preserving rev for resolve of rev |
|
352 | preserving rev for resolve of rev | |
| 353 | update: a 1/3 files (33.33%) |
|
353 | update: a 1/3 files (33.33%) | |
| 354 | removing a |
|
354 | removing a | |
| 355 | update: b 2/3 files (66.67%) |
|
355 | update: b 2/3 files (66.67%) | |
| 356 | picked tool 'python ../merge' for b (binary False symlink False) |
|
356 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 357 | merging b |
|
357 | merging b | |
| 358 |
my b@59318016310c+ other b@ |
|
358 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | |
| 359 | update: rev 3/3 files (100.00%) |
|
359 | update: rev 3/3 files (100.00%) | |
| 360 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
360 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 361 | merging rev |
|
361 | merging rev | |
| 362 |
my rev@59318016310c+ other rev@ |
|
362 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | |
| 363 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
|
363 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | |
| 364 | (branch merge, don't forget to commit) |
|
364 | (branch merge, don't forget to commit) | |
| 365 | -------------- |
|
365 | -------------- | |
| 366 | M b |
|
366 | M b | |
| 367 | -------------- |
|
367 | -------------- | |
| 368 |
|
368 | |||
| 369 | created new head |
|
369 | created new head | |
| 370 | -------------- |
|
370 | -------------- | |
| 371 | test L:nc a b R:up a b W: - 14 merge b no ancestor |
|
371 | test L:nc a b R:up a b W: - 14 merge b no ancestor | |
| 372 | -------------- |
|
372 | -------------- | |
| 373 | searching for copies back to rev 1 |
|
373 | searching for copies back to rev 1 | |
| 374 | resolving manifests |
|
374 | resolving manifests | |
| 375 | overwrite None partial False |
|
375 | overwrite None partial False | |
| 376 |
ancestor 924404dff337 local |
|
376 | ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a | |
| 377 | a: remote is newer -> g |
|
377 | a: remote is newer -> g | |
| 378 | b: versions differ -> m |
|
378 | b: versions differ -> m | |
| 379 | rev: versions differ -> m |
|
379 | rev: versions differ -> m | |
| 380 | preserving b for resolve of b |
|
380 | preserving b for resolve of b | |
| 381 | preserving rev for resolve of rev |
|
381 | preserving rev for resolve of rev | |
| 382 | update: a 1/3 files (33.33%) |
|
382 | update: a 1/3 files (33.33%) | |
| 383 | getting a |
|
383 | getting a | |
| 384 | update: b 2/3 files (66.67%) |
|
384 | update: b 2/3 files (66.67%) | |
| 385 | picked tool 'python ../merge' for b (binary False symlink False) |
|
385 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 386 | merging b |
|
386 | merging b | |
| 387 |
my b@ |
|
387 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | |
| 388 | update: rev 3/3 files (100.00%) |
|
388 | update: rev 3/3 files (100.00%) | |
| 389 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
389 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 390 | merging rev |
|
390 | merging rev | |
| 391 |
my rev@ |
|
391 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | |
| 392 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
392 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 393 | (branch merge, don't forget to commit) |
|
393 | (branch merge, don't forget to commit) | |
| 394 | -------------- |
|
394 | -------------- | |
| 395 | M a |
|
395 | M a | |
| 396 | M b |
|
396 | M b | |
| 397 | -------------- |
|
397 | -------------- | |
| 398 |
|
398 | |||
| 399 | created new head |
|
399 | created new head | |
| 400 | -------------- |
|
400 | -------------- | |
| 401 | test L:up b R:nm a b W: - 15 merge b no ancestor, remove a |
|
401 | test L:up b R:nm a b W: - 15 merge b no ancestor, remove a | |
| 402 | -------------- |
|
402 | -------------- | |
| 403 | searching for copies back to rev 1 |
|
403 | searching for copies back to rev 1 | |
| 404 | resolving manifests |
|
404 | resolving manifests | |
| 405 | overwrite None partial False |
|
405 | overwrite None partial False | |
| 406 |
ancestor 924404dff337 local 59318016310c+ remote |
|
406 | ancestor 924404dff337 local 59318016310c+ remote bdb19105162a | |
| 407 | a: other deleted -> r |
|
407 | a: other deleted -> r | |
| 408 | b: versions differ -> m |
|
408 | b: versions differ -> m | |
| 409 | rev: versions differ -> m |
|
409 | rev: versions differ -> m | |
| 410 | preserving b for resolve of b |
|
410 | preserving b for resolve of b | |
| 411 | preserving rev for resolve of rev |
|
411 | preserving rev for resolve of rev | |
| 412 | update: a 1/3 files (33.33%) |
|
412 | update: a 1/3 files (33.33%) | |
| 413 | removing a |
|
413 | removing a | |
| 414 | update: b 2/3 files (66.67%) |
|
414 | update: b 2/3 files (66.67%) | |
| 415 | picked tool 'python ../merge' for b (binary False symlink False) |
|
415 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 416 | merging b |
|
416 | merging b | |
| 417 |
my b@59318016310c+ other b@ |
|
417 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | |
| 418 | update: rev 3/3 files (100.00%) |
|
418 | update: rev 3/3 files (100.00%) | |
| 419 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
419 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 420 | merging rev |
|
420 | merging rev | |
| 421 |
my rev@59318016310c+ other rev@ |
|
421 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | |
| 422 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
|
422 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | |
| 423 | (branch merge, don't forget to commit) |
|
423 | (branch merge, don't forget to commit) | |
| 424 | -------------- |
|
424 | -------------- | |
| 425 | M b |
|
425 | M b | |
| 426 | -------------- |
|
426 | -------------- | |
| 427 |
|
427 | |||
| 428 | created new head |
|
428 | created new head | |
| 429 | -------------- |
|
429 | -------------- | |
| 430 | test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
|
430 | test L:nc a b R:up a b W: - 16 get a, merge b no ancestor | |
| 431 | -------------- |
|
431 | -------------- | |
| 432 | searching for copies back to rev 1 |
|
432 | searching for copies back to rev 1 | |
| 433 | resolving manifests |
|
433 | resolving manifests | |
| 434 | overwrite None partial False |
|
434 | overwrite None partial False | |
| 435 |
ancestor 924404dff337 local |
|
435 | ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a | |
| 436 | a: remote is newer -> g |
|
436 | a: remote is newer -> g | |
| 437 | b: versions differ -> m |
|
437 | b: versions differ -> m | |
| 438 | rev: versions differ -> m |
|
438 | rev: versions differ -> m | |
| 439 | preserving b for resolve of b |
|
439 | preserving b for resolve of b | |
| 440 | preserving rev for resolve of rev |
|
440 | preserving rev for resolve of rev | |
| 441 | update: a 1/3 files (33.33%) |
|
441 | update: a 1/3 files (33.33%) | |
| 442 | getting a |
|
442 | getting a | |
| 443 | update: b 2/3 files (66.67%) |
|
443 | update: b 2/3 files (66.67%) | |
| 444 | picked tool 'python ../merge' for b (binary False symlink False) |
|
444 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 445 | merging b |
|
445 | merging b | |
| 446 |
my b@ |
|
446 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | |
| 447 | update: rev 3/3 files (100.00%) |
|
447 | update: rev 3/3 files (100.00%) | |
| 448 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
448 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 449 | merging rev |
|
449 | merging rev | |
| 450 |
my rev@ |
|
450 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | |
| 451 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
451 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 452 | (branch merge, don't forget to commit) |
|
452 | (branch merge, don't forget to commit) | |
| 453 | -------------- |
|
453 | -------------- | |
| 454 | M a |
|
454 | M a | |
| 455 | M b |
|
455 | M b | |
| 456 | -------------- |
|
456 | -------------- | |
| 457 |
|
457 | |||
| 458 | created new head |
|
458 | created new head | |
| 459 | -------------- |
|
459 | -------------- | |
| 460 | test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
|
460 | test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor | |
| 461 | -------------- |
|
461 | -------------- | |
| 462 | searching for copies back to rev 1 |
|
462 | searching for copies back to rev 1 | |
| 463 | resolving manifests |
|
463 | resolving manifests | |
| 464 | overwrite None partial False |
|
464 | overwrite None partial False | |
| 465 |
ancestor 924404dff337 local 0b76e65c8289+ remote |
|
465 | ancestor 924404dff337 local 0b76e65c8289+ remote 4ce40f5aca24 | |
| 466 | b: versions differ -> m |
|
466 | b: versions differ -> m | |
| 467 | rev: versions differ -> m |
|
467 | rev: versions differ -> m | |
| 468 | preserving b for resolve of b |
|
468 | preserving b for resolve of b | |
| 469 | preserving rev for resolve of rev |
|
469 | preserving rev for resolve of rev | |
| 470 | update: b 1/2 files (50.00%) |
|
470 | update: b 1/2 files (50.00%) | |
| 471 | picked tool 'python ../merge' for b (binary False symlink False) |
|
471 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 472 | merging b |
|
472 | merging b | |
| 473 |
my b@0b76e65c8289+ other b@ |
|
473 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 | |
| 474 | update: rev 2/2 files (100.00%) |
|
474 | update: rev 2/2 files (100.00%) | |
| 475 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
475 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 476 | merging rev |
|
476 | merging rev | |
| 477 |
my rev@0b76e65c8289+ other rev@ |
|
477 | my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
| 478 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
478 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 479 | (branch merge, don't forget to commit) |
|
479 | (branch merge, don't forget to commit) | |
| 480 | -------------- |
|
480 | -------------- | |
| 481 | M b |
|
481 | M b | |
| 482 | C a |
|
482 | C a | |
| 483 | -------------- |
|
483 | -------------- | |
| 484 |
|
484 | |||
| 485 | created new head |
|
485 | created new head | |
| 486 | -------------- |
|
486 | -------------- | |
| 487 | test L:nm a b R:up a b W: - 18 merge b no ancestor |
|
487 | test L:nm a b R:up a b W: - 18 merge b no ancestor | |
| 488 | -------------- |
|
488 | -------------- | |
| 489 | searching for copies back to rev 1 |
|
489 | searching for copies back to rev 1 | |
| 490 | resolving manifests |
|
490 | resolving manifests | |
| 491 | overwrite None partial False |
|
491 | overwrite None partial False | |
| 492 |
ancestor 924404dff337 local |
|
492 | ancestor 924404dff337 local 02963e448370+ remote 8dbce441892a | |
| 493 | b: versions differ -> m |
|
493 | b: versions differ -> m | |
| 494 | rev: versions differ -> m |
|
494 | rev: versions differ -> m | |
| 495 | remote changed a which local deleted |
|
495 | remote changed a which local deleted | |
| 496 | use (c)hanged version or leave (d)eleted? c |
|
496 | use (c)hanged version or leave (d)eleted? c | |
| 497 | a: prompt recreating -> g |
|
497 | a: prompt recreating -> g | |
| 498 | preserving b for resolve of b |
|
498 | preserving b for resolve of b | |
| 499 | preserving rev for resolve of rev |
|
499 | preserving rev for resolve of rev | |
| 500 | update: a 1/3 files (33.33%) |
|
500 | update: a 1/3 files (33.33%) | |
| 501 | getting a |
|
501 | getting a | |
| 502 | update: b 2/3 files (66.67%) |
|
502 | update: b 2/3 files (66.67%) | |
| 503 | picked tool 'python ../merge' for b (binary False symlink False) |
|
503 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 504 | merging b |
|
504 | merging b | |
| 505 |
my b@ |
|
505 | my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 | |
| 506 | update: rev 3/3 files (100.00%) |
|
506 | update: rev 3/3 files (100.00%) | |
| 507 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
507 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 508 | merging rev |
|
508 | merging rev | |
| 509 |
my rev@ |
|
509 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 | |
| 510 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
510 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 511 | (branch merge, don't forget to commit) |
|
511 | (branch merge, don't forget to commit) | |
| 512 | -------------- |
|
512 | -------------- | |
| 513 | M a |
|
513 | M a | |
| 514 | M b |
|
514 | M b | |
| 515 | -------------- |
|
515 | -------------- | |
| 516 |
|
516 | |||
| 517 | created new head |
|
517 | created new head | |
| 518 | -------------- |
|
518 | -------------- | |
| 519 | test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
|
519 | test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a | |
| 520 | -------------- |
|
520 | -------------- | |
| 521 | searching for copies back to rev 1 |
|
521 | searching for copies back to rev 1 | |
| 522 | resolving manifests |
|
522 | resolving manifests | |
| 523 | overwrite None partial False |
|
523 | overwrite None partial False | |
| 524 |
ancestor 924404dff337 local 0b76e65c8289+ remote |
|
524 | ancestor 924404dff337 local 0b76e65c8289+ remote bdb19105162a | |
| 525 | local changed a which remote deleted |
|
525 | local changed a which remote deleted | |
| 526 | use (c)hanged version or (d)elete? c |
|
526 | use (c)hanged version or (d)elete? c | |
| 527 | a: prompt keep -> a |
|
527 | a: prompt keep -> a | |
| 528 | b: versions differ -> m |
|
528 | b: versions differ -> m | |
| 529 | rev: versions differ -> m |
|
529 | rev: versions differ -> m | |
| 530 | preserving b for resolve of b |
|
530 | preserving b for resolve of b | |
| 531 | preserving rev for resolve of rev |
|
531 | preserving rev for resolve of rev | |
| 532 | update: a 1/3 files (33.33%) |
|
532 | update: a 1/3 files (33.33%) | |
| 533 | update: b 2/3 files (66.67%) |
|
533 | update: b 2/3 files (66.67%) | |
| 534 | picked tool 'python ../merge' for b (binary False symlink False) |
|
534 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 535 | merging b |
|
535 | merging b | |
| 536 |
my b@0b76e65c8289+ other b@ |
|
536 | my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 | |
| 537 | update: rev 3/3 files (100.00%) |
|
537 | update: rev 3/3 files (100.00%) | |
| 538 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
538 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 539 | merging rev |
|
539 | merging rev | |
| 540 |
my rev@0b76e65c8289+ other rev@ |
|
540 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 | |
| 541 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
541 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 542 | (branch merge, don't forget to commit) |
|
542 | (branch merge, don't forget to commit) | |
| 543 | -------------- |
|
543 | -------------- | |
| 544 | M b |
|
544 | M b | |
| 545 | C a |
|
545 | C a | |
| 546 | -------------- |
|
546 | -------------- | |
| 547 |
|
547 | |||
| 548 | created new head |
|
548 | created new head | |
| 549 | -------------- |
|
549 | -------------- | |
| 550 | test L:up a R:um a b W: - 20 merge a and b to b, remove a |
|
550 | test L:up a R:um a b W: - 20 merge a and b to b, remove a | |
| 551 | -------------- |
|
551 | -------------- | |
| 552 | searching for copies back to rev 1 |
|
552 | searching for copies back to rev 1 | |
| 553 | unmatched files in other: |
|
553 | unmatched files in other: | |
| 554 | b |
|
554 | b | |
| 555 | all copies found (* = to merge, ! = divergent): |
|
555 | all copies found (* = to merge, ! = divergent): | |
| 556 | b -> a * |
|
556 | b -> a * | |
| 557 | checking for directory renames |
|
557 | checking for directory renames | |
| 558 | resolving manifests |
|
558 | resolving manifests | |
| 559 | overwrite None partial False |
|
559 | overwrite None partial False | |
| 560 |
ancestor 924404dff337 local e300d1c794ec+ remote |
|
560 | ancestor 924404dff337 local e300d1c794ec+ remote 49b6d8032493 | |
| 561 | rev: versions differ -> m |
|
561 | rev: versions differ -> m | |
| 562 | a: remote moved to b -> m |
|
562 | a: remote moved to b -> m | |
| 563 | preserving a for resolve of b |
|
563 | preserving a for resolve of b | |
| 564 | preserving rev for resolve of rev |
|
564 | preserving rev for resolve of rev | |
| 565 | removing a |
|
565 | removing a | |
| 566 | update: a 1/2 files (50.00%) |
|
566 | update: a 1/2 files (50.00%) | |
| 567 | picked tool 'python ../merge' for b (binary False symlink False) |
|
567 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 568 | merging a and b to b |
|
568 | merging a and b to b | |
| 569 |
my b@e300d1c794ec+ other b@ |
|
569 | my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 | |
| 570 | update: rev 2/2 files (100.00%) |
|
570 | update: rev 2/2 files (100.00%) | |
| 571 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
571 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 572 | merging rev |
|
572 | merging rev | |
| 573 |
my rev@e300d1c794ec+ other rev@ |
|
573 | my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 | |
| 574 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
574 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 575 | (branch merge, don't forget to commit) |
|
575 | (branch merge, don't forget to commit) | |
| 576 | -------------- |
|
576 | -------------- | |
| 577 | M b |
|
577 | M b | |
| 578 | a |
|
578 | a | |
| 579 | -------------- |
|
579 | -------------- | |
| 580 |
|
580 | |||
| 581 | created new head |
|
581 | created new head | |
| 582 | -------------- |
|
582 | -------------- | |
| 583 | test L:um a b R:up a W: - 21 merge a and b to b |
|
583 | test L:um a b R:up a W: - 21 merge a and b to b | |
| 584 | -------------- |
|
584 | -------------- | |
| 585 | searching for copies back to rev 1 |
|
585 | searching for copies back to rev 1 | |
| 586 | unmatched files in local: |
|
586 | unmatched files in local: | |
| 587 | b |
|
587 | b | |
| 588 | all copies found (* = to merge, ! = divergent): |
|
588 | all copies found (* = to merge, ! = divergent): | |
| 589 | b -> a * |
|
589 | b -> a * | |
| 590 | checking for directory renames |
|
590 | checking for directory renames | |
| 591 | resolving manifests |
|
591 | resolving manifests | |
| 592 | overwrite None partial False |
|
592 | overwrite None partial False | |
| 593 |
ancestor 924404dff337 local |
|
593 | ancestor 924404dff337 local 62e7bf090eba+ remote f4db7e329e71 | |
| 594 | b: local copied/moved to a -> m |
|
594 | b: local copied/moved to a -> m | |
| 595 | rev: versions differ -> m |
|
595 | rev: versions differ -> m | |
| 596 | preserving b for resolve of b |
|
596 | preserving b for resolve of b | |
| 597 | preserving rev for resolve of rev |
|
597 | preserving rev for resolve of rev | |
| 598 | update: b 1/2 files (50.00%) |
|
598 | update: b 1/2 files (50.00%) | |
| 599 | picked tool 'python ../merge' for b (binary False symlink False) |
|
599 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 600 | merging b and a to b |
|
600 | merging b and a to b | |
| 601 |
my b@ |
|
601 | my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 | |
| 602 | update: rev 2/2 files (100.00%) |
|
602 | update: rev 2/2 files (100.00%) | |
| 603 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
603 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 604 | merging rev |
|
604 | merging rev | |
| 605 |
my rev@ |
|
605 | my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
| 606 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
606 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 607 | (branch merge, don't forget to commit) |
|
607 | (branch merge, don't forget to commit) | |
| 608 | -------------- |
|
608 | -------------- | |
| 609 | M b |
|
609 | M b | |
| 610 | a |
|
610 | a | |
| 611 | -------------- |
|
611 | -------------- | |
| 612 |
|
612 | |||
| 613 | created new head |
|
613 | created new head | |
| 614 | -------------- |
|
614 | -------------- | |
| 615 | test L:nm a b R:up a c W: - 23 get c, keep b |
|
615 | test L:nm a b R:up a c W: - 23 get c, keep b | |
| 616 | -------------- |
|
616 | -------------- | |
| 617 | searching for copies back to rev 1 |
|
617 | searching for copies back to rev 1 | |
| 618 | unmatched files in local: |
|
618 | unmatched files in local: | |
| 619 | b |
|
619 | b | |
| 620 | unmatched files in other: |
|
620 | unmatched files in other: | |
| 621 | c |
|
621 | c | |
| 622 | all copies found (* = to merge, ! = divergent): |
|
622 | all copies found (* = to merge, ! = divergent): | |
| 623 | b -> a * |
|
623 | b -> a * | |
| 624 | checking for directory renames |
|
624 | checking for directory renames | |
| 625 | resolving manifests |
|
625 | resolving manifests | |
| 626 | overwrite None partial False |
|
626 | overwrite None partial False | |
| 627 |
ancestor 924404dff337 local |
|
627 | ancestor 924404dff337 local 02963e448370+ remote 2b958612230f | |
| 628 | b: local copied/moved to a -> m |
|
628 | b: local copied/moved to a -> m | |
| 629 | rev: versions differ -> m |
|
629 | rev: versions differ -> m | |
| 630 | c: remote created -> g |
|
630 | c: remote created -> g | |
| 631 | preserving b for resolve of b |
|
631 | preserving b for resolve of b | |
| 632 | preserving rev for resolve of rev |
|
632 | preserving rev for resolve of rev | |
| 633 | update: b 1/3 files (33.33%) |
|
633 | update: b 1/3 files (33.33%) | |
| 634 | picked tool 'python ../merge' for b (binary False symlink False) |
|
634 | picked tool 'python ../merge' for b (binary False symlink False) | |
| 635 | merging b and a to b |
|
635 | merging b and a to b | |
| 636 |
my b@ |
|
636 | my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 | |
| 637 | premerge successful |
|
637 | premerge successful | |
| 638 | update: c 2/3 files (66.67%) |
|
638 | update: c 2/3 files (66.67%) | |
| 639 | getting c |
|
639 | getting c | |
| 640 | update: rev 3/3 files (100.00%) |
|
640 | update: rev 3/3 files (100.00%) | |
| 641 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
641 | picked tool 'python ../merge' for rev (binary False symlink False) | |
| 642 | merging rev |
|
642 | merging rev | |
| 643 |
my rev@ |
|
643 | my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 | |
| 644 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
|
644 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
| 645 | (branch merge, don't forget to commit) |
|
645 | (branch merge, don't forget to commit) | |
| 646 | -------------- |
|
646 | -------------- | |
| 647 | M b |
|
647 | M b | |
| 648 | a |
|
648 | a | |
| 649 | M c |
|
649 | M c | |
| 650 | -------------- |
|
650 | -------------- | |
| 651 |
|
651 | |||
| @@ -1,192 +1,192 b'' | |||||
| 1 | # creating 'remote' |
|
1 | # creating 'remote' | |
| 2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 3 | created new head |
|
3 | created new head | |
| 4 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
4 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 5 | rev offset length base linkrev nodeid p1 p2 |
|
5 | rev offset length base linkrev nodeid p1 p2 | |
| 6 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
|
6 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 | |
| 7 | 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 |
|
7 | 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 | |
| 8 | 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 |
|
8 | 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 | |
| 9 | 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 |
|
9 | 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 | |
| 10 | rev offset length base linkrev nodeid p1 p2 |
|
10 | rev offset length base linkrev nodeid p1 p2 | |
| 11 |
0 0 75 0 7 |
|
11 | 0 0 75 0 7 2565f3199a74 000000000000 000000000000 | |
| 12 | rev offset length base linkrev nodeid p1 p2 |
|
12 | rev offset length base linkrev nodeid p1 p2 | |
| 13 |
0 0 75 0 8 |
|
13 | 0 0 75 0 8 2565f3199a74 000000000000 000000000000 | |
| 14 | rev offset length base linkrev nodeid p1 p2 |
|
14 | rev offset length base linkrev nodeid p1 p2 | |
| 15 | 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 |
|
15 | 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 | |
| 16 | rev offset length base linkrev nodeid p1 p2 |
|
16 | rev offset length base linkrev nodeid p1 p2 | |
| 17 | 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 |
|
17 | 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 | |
| 18 | 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 |
|
18 | 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 | |
| 19 | 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 |
|
19 | 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 | |
| 20 | 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 |
|
20 | 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 | |
| 21 | 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 |
|
21 | 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 | |
| 22 |
5 250 68 3 7 |
|
22 | 5 250 68 3 7 09bb521d218d de68e904d169 000000000000 | |
| 23 |
6 318 54 6 8 |
|
23 | 6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000 | |
| 24 | checking changesets |
|
24 | checking changesets | |
| 25 | checking manifests |
|
25 | checking manifests | |
| 26 | crosschecking files in changesets and manifests |
|
26 | crosschecking files in changesets and manifests | |
| 27 | checking files |
|
27 | checking files | |
| 28 | 4 files, 9 changesets, 7 total revisions |
|
28 | 4 files, 9 changesets, 7 total revisions | |
| 29 | # clone remote via stream |
|
29 | # clone remote via stream | |
| 30 | requesting all changes |
|
30 | requesting all changes | |
| 31 | adding changesets |
|
31 | adding changesets | |
| 32 | adding manifests |
|
32 | adding manifests | |
| 33 | adding file changes |
|
33 | adding file changes | |
| 34 | added 1 changesets with 1 changes to 1 files |
|
34 | added 1 changesets with 1 changes to 1 files | |
| 35 | updating to branch default |
|
35 | updating to branch default | |
| 36 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
36 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 37 | checking changesets |
|
37 | checking changesets | |
| 38 | checking manifests |
|
38 | checking manifests | |
| 39 | crosschecking files in changesets and manifests |
|
39 | crosschecking files in changesets and manifests | |
| 40 | checking files |
|
40 | checking files | |
| 41 | 1 files, 1 changesets, 1 total revisions |
|
41 | 1 files, 1 changesets, 1 total revisions | |
| 42 | requesting all changes |
|
42 | requesting all changes | |
| 43 | adding changesets |
|
43 | adding changesets | |
| 44 | adding manifests |
|
44 | adding manifests | |
| 45 | adding file changes |
|
45 | adding file changes | |
| 46 | added 2 changesets with 2 changes to 1 files |
|
46 | added 2 changesets with 2 changes to 1 files | |
| 47 | updating to branch default |
|
47 | updating to branch default | |
| 48 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
48 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 49 | checking changesets |
|
49 | checking changesets | |
| 50 | checking manifests |
|
50 | checking manifests | |
| 51 | crosschecking files in changesets and manifests |
|
51 | crosschecking files in changesets and manifests | |
| 52 | checking files |
|
52 | checking files | |
| 53 | 1 files, 2 changesets, 2 total revisions |
|
53 | 1 files, 2 changesets, 2 total revisions | |
| 54 | requesting all changes |
|
54 | requesting all changes | |
| 55 | adding changesets |
|
55 | adding changesets | |
| 56 | adding manifests |
|
56 | adding manifests | |
| 57 | adding file changes |
|
57 | adding file changes | |
| 58 | added 3 changesets with 3 changes to 1 files |
|
58 | added 3 changesets with 3 changes to 1 files | |
| 59 | updating to branch default |
|
59 | updating to branch default | |
| 60 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
60 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 61 | checking changesets |
|
61 | checking changesets | |
| 62 | checking manifests |
|
62 | checking manifests | |
| 63 | crosschecking files in changesets and manifests |
|
63 | crosschecking files in changesets and manifests | |
| 64 | checking files |
|
64 | checking files | |
| 65 | 1 files, 3 changesets, 3 total revisions |
|
65 | 1 files, 3 changesets, 3 total revisions | |
| 66 | requesting all changes |
|
66 | requesting all changes | |
| 67 | adding changesets |
|
67 | adding changesets | |
| 68 | adding manifests |
|
68 | adding manifests | |
| 69 | adding file changes |
|
69 | adding file changes | |
| 70 | added 4 changesets with 4 changes to 1 files |
|
70 | added 4 changesets with 4 changes to 1 files | |
| 71 | updating to branch default |
|
71 | updating to branch default | |
| 72 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
72 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 73 | checking changesets |
|
73 | checking changesets | |
| 74 | checking manifests |
|
74 | checking manifests | |
| 75 | crosschecking files in changesets and manifests |
|
75 | crosschecking files in changesets and manifests | |
| 76 | checking files |
|
76 | checking files | |
| 77 | 1 files, 4 changesets, 4 total revisions |
|
77 | 1 files, 4 changesets, 4 total revisions | |
| 78 | requesting all changes |
|
78 | requesting all changes | |
| 79 | adding changesets |
|
79 | adding changesets | |
| 80 | adding manifests |
|
80 | adding manifests | |
| 81 | adding file changes |
|
81 | adding file changes | |
| 82 | added 2 changesets with 2 changes to 1 files |
|
82 | added 2 changesets with 2 changes to 1 files | |
| 83 | updating to branch default |
|
83 | updating to branch default | |
| 84 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
84 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 85 | checking changesets |
|
85 | checking changesets | |
| 86 | checking manifests |
|
86 | checking manifests | |
| 87 | crosschecking files in changesets and manifests |
|
87 | crosschecking files in changesets and manifests | |
| 88 | checking files |
|
88 | checking files | |
| 89 | 1 files, 2 changesets, 2 total revisions |
|
89 | 1 files, 2 changesets, 2 total revisions | |
| 90 | requesting all changes |
|
90 | requesting all changes | |
| 91 | adding changesets |
|
91 | adding changesets | |
| 92 | adding manifests |
|
92 | adding manifests | |
| 93 | adding file changes |
|
93 | adding file changes | |
| 94 | added 3 changesets with 3 changes to 1 files |
|
94 | added 3 changesets with 3 changes to 1 files | |
| 95 | updating to branch default |
|
95 | updating to branch default | |
| 96 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
96 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 97 | checking changesets |
|
97 | checking changesets | |
| 98 | checking manifests |
|
98 | checking manifests | |
| 99 | crosschecking files in changesets and manifests |
|
99 | crosschecking files in changesets and manifests | |
| 100 | checking files |
|
100 | checking files | |
| 101 | 1 files, 3 changesets, 3 total revisions |
|
101 | 1 files, 3 changesets, 3 total revisions | |
| 102 | requesting all changes |
|
102 | requesting all changes | |
| 103 | adding changesets |
|
103 | adding changesets | |
| 104 | adding manifests |
|
104 | adding manifests | |
| 105 | adding file changes |
|
105 | adding file changes | |
| 106 | added 4 changesets with 5 changes to 2 files |
|
106 | added 4 changesets with 5 changes to 2 files | |
| 107 | updating to branch default |
|
107 | updating to branch default | |
| 108 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
108 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 109 | checking changesets |
|
109 | checking changesets | |
| 110 | checking manifests |
|
110 | checking manifests | |
| 111 | crosschecking files in changesets and manifests |
|
111 | crosschecking files in changesets and manifests | |
| 112 | checking files |
|
112 | checking files | |
| 113 | 2 files, 4 changesets, 5 total revisions |
|
113 | 2 files, 4 changesets, 5 total revisions | |
| 114 | requesting all changes |
|
114 | requesting all changes | |
| 115 | adding changesets |
|
115 | adding changesets | |
| 116 | adding manifests |
|
116 | adding manifests | |
| 117 | adding file changes |
|
117 | adding file changes | |
| 118 | added 5 changesets with 6 changes to 3 files |
|
118 | added 5 changesets with 6 changes to 3 files | |
| 119 | updating to branch default |
|
119 | updating to branch default | |
| 120 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
120 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 121 | checking changesets |
|
121 | checking changesets | |
| 122 | checking manifests |
|
122 | checking manifests | |
| 123 | crosschecking files in changesets and manifests |
|
123 | crosschecking files in changesets and manifests | |
| 124 | checking files |
|
124 | checking files | |
| 125 | 3 files, 5 changesets, 6 total revisions |
|
125 | 3 files, 5 changesets, 6 total revisions | |
| 126 | requesting all changes |
|
126 | requesting all changes | |
| 127 | adding changesets |
|
127 | adding changesets | |
| 128 | adding manifests |
|
128 | adding manifests | |
| 129 | adding file changes |
|
129 | adding file changes | |
| 130 | added 5 changesets with 5 changes to 2 files |
|
130 | added 5 changesets with 5 changes to 2 files | |
| 131 | updating to branch default |
|
131 | updating to branch default | |
| 132 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
132 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 133 | checking changesets |
|
133 | checking changesets | |
| 134 | checking manifests |
|
134 | checking manifests | |
| 135 | crosschecking files in changesets and manifests |
|
135 | crosschecking files in changesets and manifests | |
| 136 | checking files |
|
136 | checking files | |
| 137 | 2 files, 5 changesets, 5 total revisions |
|
137 | 2 files, 5 changesets, 5 total revisions | |
| 138 | pulling from ../test-7 |
|
138 | pulling from ../test-7 | |
| 139 | searching for changes |
|
139 | searching for changes | |
| 140 | adding changesets |
|
140 | adding changesets | |
| 141 | adding manifests |
|
141 | adding manifests | |
| 142 | adding file changes |
|
142 | adding file changes | |
| 143 | added 4 changesets with 2 changes to 3 files (+1 heads) |
|
143 | added 4 changesets with 2 changes to 3 files (+1 heads) | |
| 144 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
144 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 145 | checking changesets |
|
145 | checking changesets | |
| 146 | checking manifests |
|
146 | checking manifests | |
| 147 | crosschecking files in changesets and manifests |
|
147 | crosschecking files in changesets and manifests | |
| 148 | checking files |
|
148 | checking files | |
| 149 | 4 files, 9 changesets, 7 total revisions |
|
149 | 4 files, 9 changesets, 7 total revisions | |
| 150 | pulling from ssh://user@dummy/remote |
|
150 | pulling from ssh://user@dummy/remote | |
| 151 | searching for changes |
|
151 | searching for changes | |
| 152 | adding changesets |
|
152 | adding changesets | |
| 153 | adding manifests |
|
153 | adding manifests | |
| 154 | adding file changes |
|
154 | adding file changes | |
| 155 | added 1 changesets with 0 changes to 1 files (+1 heads) |
|
155 | added 1 changesets with 0 changes to 1 files (+1 heads) | |
| 156 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
156 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 157 | checking changesets |
|
157 | checking changesets | |
| 158 | checking manifests |
|
158 | checking manifests | |
| 159 | crosschecking files in changesets and manifests |
|
159 | crosschecking files in changesets and manifests | |
| 160 | checking files |
|
160 | checking files | |
| 161 | 1 files, 3 changesets, 2 total revisions |
|
161 | 1 files, 3 changesets, 2 total revisions | |
| 162 | pulling from ssh://user@dummy/remote |
|
162 | pulling from ssh://user@dummy/remote | |
| 163 | searching for changes |
|
163 | searching for changes | |
| 164 | adding changesets |
|
164 | adding changesets | |
| 165 | adding manifests |
|
165 | adding manifests | |
| 166 | adding file changes |
|
166 | adding file changes | |
| 167 | added 6 changesets with 5 changes to 4 files |
|
167 | added 6 changesets with 5 changes to 4 files | |
| 168 | (run 'hg update' to get a working copy) |
|
168 | (run 'hg update' to get a working copy) | |
| 169 | pulling from ssh://user@dummy/remote |
|
169 | pulling from ssh://user@dummy/remote | |
| 170 | searching for changes |
|
170 | searching for changes | |
| 171 | adding changesets |
|
171 | adding changesets | |
| 172 | adding manifests |
|
172 | adding manifests | |
| 173 | adding file changes |
|
173 | adding file changes | |
| 174 | added 2 changesets with 0 changes to 1 files (+1 heads) |
|
174 | added 2 changesets with 0 changes to 1 files (+1 heads) | |
| 175 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
175 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 176 | checking changesets |
|
176 | checking changesets | |
| 177 | checking manifests |
|
177 | checking manifests | |
| 178 | crosschecking files in changesets and manifests |
|
178 | crosschecking files in changesets and manifests | |
| 179 | checking files |
|
179 | checking files | |
| 180 | 1 files, 5 changesets, 3 total revisions |
|
180 | 1 files, 5 changesets, 3 total revisions | |
| 181 | pulling from ssh://user@dummy/remote |
|
181 | pulling from ssh://user@dummy/remote | |
| 182 | searching for changes |
|
182 | searching for changes | |
| 183 | adding changesets |
|
183 | adding changesets | |
| 184 | adding manifests |
|
184 | adding manifests | |
| 185 | adding file changes |
|
185 | adding file changes | |
| 186 | added 4 changesets with 4 changes to 4 files |
|
186 | added 4 changesets with 4 changes to 4 files | |
| 187 | (run 'hg update' to get a working copy) |
|
187 | (run 'hg update' to get a working copy) | |
| 188 | checking changesets |
|
188 | checking changesets | |
| 189 | checking manifests |
|
189 | checking manifests | |
| 190 | crosschecking files in changesets and manifests |
|
190 | crosschecking files in changesets and manifests | |
| 191 | checking files |
|
191 | checking files | |
| 192 | 4 files, 9 changesets, 7 total revisions |
|
192 | 4 files, 9 changesets, 7 total revisions | |
| @@ -1,304 +1,304 b'' | |||||
| 1 | [hooks] |
|
1 | [hooks] | |
| 2 | pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
|
2 | pretxncommit.crlf = python:hgext.win32text.forbidcrlf | |
| 3 | pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf |
|
3 | pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf | |
| 4 |
|
4 | |||
| 5 | commit should succeed |
|
5 | commit should succeed | |
| 6 |
|
6 | |||
| 7 | updating to branch default |
|
7 | updating to branch default | |
| 8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 9 | commit should fail |
|
9 | commit should fail | |
| 10 | Attempt to commit or push text file(s) using CRLF line endings |
|
10 | Attempt to commit or push text file(s) using CRLF line endings | |
| 11 | in f583ea08d42a: f |
|
11 | in f583ea08d42a: f | |
| 12 | transaction abort! |
|
12 | transaction abort! | |
| 13 | rollback completed |
|
13 | rollback completed | |
| 14 | abort: pretxncommit.crlf hook failed |
|
14 | abort: pretxncommit.crlf hook failed | |
| 15 |
|
15 | |||
| 16 | commits should succeed |
|
16 | commits should succeed | |
| 17 |
|
17 | |||
| 18 | push should fail |
|
18 | push should fail | |
| 19 | pushing to ../zoz |
|
19 | pushing to ../zoz | |
| 20 | searching for changes |
|
20 | searching for changes | |
| 21 | adding changesets |
|
21 | adding changesets | |
| 22 | adding manifests |
|
22 | adding manifests | |
| 23 | adding file changes |
|
23 | adding file changes | |
| 24 | added 2 changesets with 2 changes to 2 files |
|
24 | added 2 changesets with 2 changes to 2 files | |
| 25 | Attempt to commit or push text file(s) using CRLF line endings |
|
25 | Attempt to commit or push text file(s) using CRLF line endings | |
| 26 |
in b |
|
26 | in bc2d09796734: g | |
| 27 | in b1aa5cde7ff4: f |
|
27 | in b1aa5cde7ff4: f | |
| 28 |
|
28 | |||
| 29 | To prevent this mistake in your local repository, |
|
29 | To prevent this mistake in your local repository, | |
| 30 | add to Mercurial.ini or .hg/hgrc: |
|
30 | add to Mercurial.ini or .hg/hgrc: | |
| 31 |
|
31 | |||
| 32 | [hooks] |
|
32 | [hooks] | |
| 33 | pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
|
33 | pretxncommit.crlf = python:hgext.win32text.forbidcrlf | |
| 34 |
|
34 | |||
| 35 | and also consider adding: |
|
35 | and also consider adding: | |
| 36 |
|
36 | |||
| 37 | [extensions] |
|
37 | [extensions] | |
| 38 | win32text = |
|
38 | win32text = | |
| 39 | [encode] |
|
39 | [encode] | |
| 40 | ** = cleverencode: |
|
40 | ** = cleverencode: | |
| 41 | [decode] |
|
41 | [decode] | |
| 42 | ** = cleverdecode: |
|
42 | ** = cleverdecode: | |
| 43 | transaction abort! |
|
43 | transaction abort! | |
| 44 | rollback completed |
|
44 | rollback completed | |
| 45 | abort: pretxnchangegroup.crlf hook failed |
|
45 | abort: pretxnchangegroup.crlf hook failed | |
| 46 |
|
46 | |||
| 47 | commit should succeed |
|
47 | commit should succeed | |
| 48 |
|
48 | |||
| 49 | push should succeed |
|
49 | push should succeed | |
| 50 | pushing to ../zoz |
|
50 | pushing to ../zoz | |
| 51 | searching for changes |
|
51 | searching for changes | |
| 52 | adding changesets |
|
52 | adding changesets | |
| 53 | adding manifests |
|
53 | adding manifests | |
| 54 | adding file changes |
|
54 | adding file changes | |
| 55 | added 3 changesets with 3 changes to 2 files |
|
55 | added 3 changesets with 3 changes to 2 files | |
| 56 |
|
56 | |||
| 57 | and now for something completely different |
|
57 | and now for something completely different | |
| 58 | Attempt to commit or push text file(s) using CRLF line endings |
|
58 | Attempt to commit or push text file(s) using CRLF line endings | |
| 59 | in cefdb8d0b741: d/f2 |
|
59 | in 053ba1a3035a: d/f2 | |
| 60 | transaction abort! |
|
60 | transaction abort! | |
| 61 | rollback completed |
|
61 | rollback completed | |
| 62 | abort: pretxncommit.crlf hook failed |
|
62 | abort: pretxncommit.crlf hook failed | |
| 63 | forgetting d/f2 |
|
63 | forgetting d/f2 | |
| 64 |
|
64 | |||
| 65 |
|
65 | |||
| 66 |
changeset: 5: |
|
66 | changeset: 5:f0b1c8d75fce | |
| 67 | tag: tip |
|
67 | tag: tip | |
| 68 | user: test |
|
68 | user: test | |
| 69 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
69 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 70 | files: bin |
|
70 | files: bin | |
| 71 | description: |
|
71 | description: | |
| 72 | 5 |
|
72 | 5 | |
| 73 |
|
73 | |||
| 74 |
|
74 | |||
| 75 |
changeset: 4: |
|
75 | changeset: 4:77796dbcd4ad | |
| 76 | user: test |
|
76 | user: test | |
| 77 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
77 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 78 | files: f |
|
78 | files: f | |
| 79 | description: |
|
79 | description: | |
| 80 | 4 |
|
80 | 4 | |
| 81 |
|
81 | |||
| 82 |
|
82 | |||
| 83 |
changeset: 3:7 |
|
83 | changeset: 3:7c1b5430b350 | |
| 84 | user: test |
|
84 | user: test | |
| 85 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
85 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 86 | files: f g |
|
86 | files: f g | |
| 87 | description: |
|
87 | description: | |
| 88 | 2.3 |
|
88 | 2.3 | |
| 89 |
|
89 | |||
| 90 |
|
90 | |||
| 91 |
changeset: 2:b |
|
91 | changeset: 2:bc2d09796734 | |
| 92 | user: test |
|
92 | user: test | |
| 93 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
93 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 94 | files: g |
|
94 | files: g | |
| 95 | description: |
|
95 | description: | |
| 96 | 2.2 |
|
96 | 2.2 | |
| 97 |
|
97 | |||
| 98 |
|
98 | |||
| 99 | changeset: 1:b1aa5cde7ff4 |
|
99 | changeset: 1:b1aa5cde7ff4 | |
| 100 | user: test |
|
100 | user: test | |
| 101 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
101 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 102 | files: f |
|
102 | files: f | |
| 103 | description: |
|
103 | description: | |
| 104 | 2 |
|
104 | 2 | |
| 105 |
|
105 | |||
| 106 |
|
106 | |||
| 107 | changeset: 0:fcf06d5c4e1d |
|
107 | changeset: 0:fcf06d5c4e1d | |
| 108 | user: test |
|
108 | user: test | |
| 109 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
109 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 110 | files: f |
|
110 | files: f | |
| 111 | description: |
|
111 | description: | |
| 112 | 1 |
|
112 | 1 | |
| 113 |
|
113 | |||
| 114 |
|
114 | |||
| 115 |
|
115 | |||
| 116 | updating to branch default |
|
116 | updating to branch default | |
| 117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 118 |
|
118 | |||
| 119 | adding dupe/a |
|
119 | adding dupe/a | |
| 120 | adding dupe/b |
|
120 | adding dupe/b | |
| 121 | adding dupe/c |
|
121 | adding dupe/c | |
| 122 | adding dupe/d |
|
122 | adding dupe/d | |
| 123 |
changeset: 8: |
|
123 | changeset: 8:67ac5962ab43 | |
| 124 | tag: tip |
|
124 | tag: tip | |
| 125 | user: test |
|
125 | user: test | |
| 126 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
126 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 127 | files: d |
|
127 | files: d | |
| 128 | description: |
|
128 | description: | |
| 129 | d |
|
129 | d | |
| 130 |
|
130 | |||
| 131 |
|
131 | |||
| 132 |
changeset: 7: |
|
132 | changeset: 7:68c127d1834e | |
| 133 | user: test |
|
133 | user: test | |
| 134 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
134 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 135 | files: b c |
|
135 | files: b c | |
| 136 | description: |
|
136 | description: | |
| 137 | b/c |
|
137 | b/c | |
| 138 |
|
138 | |||
| 139 |
|
139 | |||
| 140 |
changeset: 6:a |
|
140 | changeset: 6:adbf8bf7f31d | |
| 141 | user: test |
|
141 | user: test | |
| 142 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
142 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 143 | files: a |
|
143 | files: a | |
| 144 | description: |
|
144 | description: | |
| 145 | a |
|
145 | a | |
| 146 |
|
146 | |||
| 147 |
|
147 | |||
| 148 |
changeset: 5: |
|
148 | changeset: 5:f0b1c8d75fce | |
| 149 | user: test |
|
149 | user: test | |
| 150 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
150 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 151 | files: bin |
|
151 | files: bin | |
| 152 | description: |
|
152 | description: | |
| 153 | 5 |
|
153 | 5 | |
| 154 |
|
154 | |||
| 155 |
|
155 | |||
| 156 |
changeset: 4: |
|
156 | changeset: 4:77796dbcd4ad | |
| 157 | user: test |
|
157 | user: test | |
| 158 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
158 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 159 | files: f |
|
159 | files: f | |
| 160 | description: |
|
160 | description: | |
| 161 | 4 |
|
161 | 4 | |
| 162 |
|
162 | |||
| 163 |
|
163 | |||
| 164 |
changeset: 3:7 |
|
164 | changeset: 3:7c1b5430b350 | |
| 165 | user: test |
|
165 | user: test | |
| 166 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
166 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 167 | files: f g |
|
167 | files: f g | |
| 168 | description: |
|
168 | description: | |
| 169 | 2.3 |
|
169 | 2.3 | |
| 170 |
|
170 | |||
| 171 |
|
171 | |||
| 172 |
changeset: 2:b |
|
172 | changeset: 2:bc2d09796734 | |
| 173 | user: test |
|
173 | user: test | |
| 174 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
174 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 175 | files: g |
|
175 | files: g | |
| 176 | description: |
|
176 | description: | |
| 177 | 2.2 |
|
177 | 2.2 | |
| 178 |
|
178 | |||
| 179 |
|
179 | |||
| 180 | changeset: 1:b1aa5cde7ff4 |
|
180 | changeset: 1:b1aa5cde7ff4 | |
| 181 | user: test |
|
181 | user: test | |
| 182 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
182 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 183 | files: f |
|
183 | files: f | |
| 184 | description: |
|
184 | description: | |
| 185 | 2 |
|
185 | 2 | |
| 186 |
|
186 | |||
| 187 |
|
187 | |||
| 188 | changeset: 0:fcf06d5c4e1d |
|
188 | changeset: 0:fcf06d5c4e1d | |
| 189 | user: test |
|
189 | user: test | |
| 190 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
190 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 191 | files: f |
|
191 | files: f | |
| 192 | description: |
|
192 | description: | |
| 193 | 1 |
|
193 | 1 | |
| 194 |
|
194 | |||
| 195 |
|
195 | |||
| 196 |
|
196 | |||
| 197 | pulling from dupe |
|
197 | pulling from dupe | |
| 198 | searching for changes |
|
198 | searching for changes | |
| 199 | adding changesets |
|
199 | adding changesets | |
| 200 | adding manifests |
|
200 | adding manifests | |
| 201 | adding file changes |
|
201 | adding file changes | |
| 202 | added 3 changesets with 4 changes to 4 files |
|
202 | added 3 changesets with 4 changes to 4 files | |
| 203 | Attempt to commit or push text file(s) using CRLF line endings |
|
203 | Attempt to commit or push text file(s) using CRLF line endings | |
| 204 | in 7654104f33c3: d |
|
204 | in 67ac5962ab43: d | |
| 205 | in 9be4c2808cc9: b |
|
205 | in 68c127d1834e: b | |
| 206 | in 9be4c2808cc9: c |
|
206 | in 68c127d1834e: c | |
| 207 |
|
207 | |||
| 208 | To prevent this mistake in your local repository, |
|
208 | To prevent this mistake in your local repository, | |
| 209 | add to Mercurial.ini or .hg/hgrc: |
|
209 | add to Mercurial.ini or .hg/hgrc: | |
| 210 |
|
210 | |||
| 211 | [hooks] |
|
211 | [hooks] | |
| 212 | pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
|
212 | pretxncommit.crlf = python:hgext.win32text.forbidcrlf | |
| 213 |
|
213 | |||
| 214 | and also consider adding: |
|
214 | and also consider adding: | |
| 215 |
|
215 | |||
| 216 | [extensions] |
|
216 | [extensions] | |
| 217 | win32text = |
|
217 | win32text = | |
| 218 | [encode] |
|
218 | [encode] | |
| 219 | ** = cleverencode: |
|
219 | ** = cleverencode: | |
| 220 | [decode] |
|
220 | [decode] | |
| 221 | ** = cleverdecode: |
|
221 | ** = cleverdecode: | |
| 222 | transaction abort! |
|
222 | transaction abort! | |
| 223 | rollback completed |
|
223 | rollback completed | |
| 224 | abort: pretxnchangegroup.crlf hook failed |
|
224 | abort: pretxnchangegroup.crlf hook failed | |
| 225 |
|
225 | |||
| 226 |
changeset: 5: |
|
226 | changeset: 5:f0b1c8d75fce | |
| 227 | tag: tip |
|
227 | tag: tip | |
| 228 | user: test |
|
228 | user: test | |
| 229 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
229 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 230 | files: bin |
|
230 | files: bin | |
| 231 | description: |
|
231 | description: | |
| 232 | 5 |
|
232 | 5 | |
| 233 |
|
233 | |||
| 234 |
|
234 | |||
| 235 |
changeset: 4: |
|
235 | changeset: 4:77796dbcd4ad | |
| 236 | user: test |
|
236 | user: test | |
| 237 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
237 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 238 | files: f |
|
238 | files: f | |
| 239 | description: |
|
239 | description: | |
| 240 | 4 |
|
240 | 4 | |
| 241 |
|
241 | |||
| 242 |
|
242 | |||
| 243 |
changeset: 3:7 |
|
243 | changeset: 3:7c1b5430b350 | |
| 244 | user: test |
|
244 | user: test | |
| 245 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
245 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 246 | files: f g |
|
246 | files: f g | |
| 247 | description: |
|
247 | description: | |
| 248 | 2.3 |
|
248 | 2.3 | |
| 249 |
|
249 | |||
| 250 |
|
250 | |||
| 251 |
changeset: 2:b |
|
251 | changeset: 2:bc2d09796734 | |
| 252 | user: test |
|
252 | user: test | |
| 253 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
253 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 254 | files: g |
|
254 | files: g | |
| 255 | description: |
|
255 | description: | |
| 256 | 2.2 |
|
256 | 2.2 | |
| 257 |
|
257 | |||
| 258 |
|
258 | |||
| 259 | changeset: 1:b1aa5cde7ff4 |
|
259 | changeset: 1:b1aa5cde7ff4 | |
| 260 | user: test |
|
260 | user: test | |
| 261 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
261 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 262 | files: f |
|
262 | files: f | |
| 263 | description: |
|
263 | description: | |
| 264 | 2 |
|
264 | 2 | |
| 265 |
|
265 | |||
| 266 |
|
266 | |||
| 267 | changeset: 0:fcf06d5c4e1d |
|
267 | changeset: 0:fcf06d5c4e1d | |
| 268 | user: test |
|
268 | user: test | |
| 269 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
269 | date: Thu Jan 01 00:00:00 1970 +0000 | |
| 270 | files: f |
|
270 | files: f | |
| 271 | description: |
|
271 | description: | |
| 272 | 1 |
|
272 | 1 | |
| 273 |
|
273 | |||
| 274 |
|
274 | |||
| 275 |
|
275 | |||
| 276 | hello<NUL><CR><LF> |
|
276 | hello<NUL><CR><LF> | |
| 277 | some<LF>text<LF> |
|
277 | some<LF>text<LF> | |
| 278 | rem empty<CR><LF> |
|
278 | rem empty<CR><LF> | |
| 279 |
|
279 | |||
| 280 | [extensions] |
|
280 | [extensions] | |
| 281 | win32text = |
|
281 | win32text = | |
| 282 | [decode] |
|
282 | [decode] | |
| 283 | ** = cleverdecode: |
|
283 | ** = cleverdecode: | |
| 284 | [encode] |
|
284 | [encode] | |
| 285 | ** = cleverencode: |
|
285 | ** = cleverencode: | |
| 286 |
|
286 | |||
| 287 | WARNING: f4.bat already has CRLF line endings |
|
287 | WARNING: f4.bat already has CRLF line endings | |
| 288 | and does not need EOL conversion by the win32text plugin. |
|
288 | and does not need EOL conversion by the win32text plugin. | |
| 289 | Before your next commit, please reconsider your encode/decode settings in |
|
289 | Before your next commit, please reconsider your encode/decode settings in | |
| 290 | Mercurial.ini or ..../.hg/hgrc. |
|
290 | Mercurial.ini or ..../.hg/hgrc. | |
| 291 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
291 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 292 | hello<NUL><CR><LF> |
|
292 | hello<NUL><CR><LF> | |
| 293 | some<CR><LF>text<CR><LF> |
|
293 | some<CR><LF>text<CR><LF> | |
| 294 | rem empty<CR><LF> |
|
294 | rem empty<CR><LF> | |
| 295 |
|
295 | |||
| 296 | # empty<CR><LF> |
|
296 | # empty<CR><LF> | |
| 297 | # empty<LF> |
|
297 | # empty<LF> | |
| 298 | % just linefeed<LF> |
|
298 | % just linefeed<LF> | |
| 299 | % just linefeed<LF> |
|
299 | % just linefeed<LF> | |
| 300 | no changes needed to linefeed |
|
300 | no changes needed to linefeed | |
| 301 | % just linefeed<LF> |
|
301 | % just linefeed<LF> | |
| 302 | M linefeed |
|
302 | M linefeed | |
| 303 | reverting linefeed |
|
303 | reverting linefeed | |
| 304 | % just linefeed<CR><LF> |
|
304 | % just linefeed<CR><LF> | |
General Comments 0
You need to be logged in to leave comments.
Login now