Mercurial > hg
annotate tests/test-keyword.out @ 9336:dd6f605b15c0
mq: upgrade the patch to HG format when adding the author name with qrefresh
When setting the author field with qrefresh (-u|-U), and the patch does have
neither a 'From:' nor a '# User' header, add the author name as such:
- if the patch has a 'Date:' header, add a 'From:' header
- otherwise, upgrade to Mercurial extended patch format and add # From
author | Yann E. MORIN <yann.morin.1998@anciens.enib.fr> |
---|---|
date | Wed, 12 Aug 2009 10:48:18 +0200 |
parents | 7bd1b663727d |
children | 4483af166c61 |
rev | line source |
---|---|
5816 | 1 % hg kwdemo |
2 [extensions] | |
3 hgext.keyword = | |
4 [keyword] | |
5 * = | |
6 b = ignore | |
7 demo.txt = | |
8 [keywordmaps] | |
9 RCSFile = {file|basename},v | |
10 Author = {author|user} | |
11 Header = {root}/{file},v {node|short} {date|utcdate} {author|user} | |
12 Source = {root}/{file},v | |
13 Date = {date|utcdate} | |
14 Id = {file|basename},v {node|short} {date|utcdate} {author|user} | |
15 Revision = {node|short} | |
16 $RCSFile: demo.txt,v $ | |
17 $Author: test $ | |
18 $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ | |
19 $Source: /TMP/demo.txt,v $ | |
20 $Date: 2000/00/00 00:00:00 $ | |
21 $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ | |
22 $Revision: xxxxxxxxxxxx $ | |
23 [extensions] | |
24 hgext.keyword = | |
25 [keyword] | |
26 * = | |
27 b = ignore | |
28 demo.txt = | |
29 [keywordmaps] | |
30 Branch = {branches} | |
31 $Branch: demobranch $ | |
32 % kwshrink should exit silently in empty/invalid repo | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
33 pulling from test-keyword.hg |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
34 requesting all changes |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
35 adding changesets |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
36 adding manifests |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
37 adding file changes |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
38 added 1 changesets with 1 changes to 1 files |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5816 | 40 % cat |
41 expand $Id$ | |
42 do not process $Id: | |
43 xxx $ | |
44 ignore $Id$ | |
45 % addremove | |
46 adding a | |
47 adding b | |
48 % status | |
49 A a | |
50 A b | |
51 % default keyword expansion including commit hook | |
52 % interrupted commit should not change state or run commit hook | |
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5816
diff
changeset
|
53 abort: empty commit message |
5816 | 54 % status |
55 A a | |
56 A b | |
57 % commit | |
58 a | |
59 b | |
60 overwriting a expanding keywords | |
61 running hook commit.test: cp a hooktest | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
62 committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
5816 | 63 % status |
64 ? hooktest | |
65 % identify | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
66 ef63ca68695b |
5816 | 67 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
68 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 69 do not process $Id: |
70 xxx $ | |
71 ignore $Id$ | |
72 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
73 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 74 do not process $Id: |
75 xxx $ | |
76 ignore $Id$ | |
77 a | |
78 % diff a hooktest | |
79 % removing commit hook from config | |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
80 % bundle |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
81 2 changesets found |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
82 % notify on pull to check whether keywords stay as is in email |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
83 % ie. if patch.diff wrapper acts as it should |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
84 % pull from bundle |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
85 pulling from ../kw.hg |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
86 requesting all changes |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
87 adding changesets |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
88 adding manifests |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
89 adding file changes |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
90 added 2 changesets with 3 changes to 3 files |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
91 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
92 diff -r 000000000000 -r a2392c293916 sym |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
93 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
94 +++ b/sym Sat Feb 09 20:25:47 2008 +0100 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
95 @@ -0,0 +1,1 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
96 +a |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
97 \ No newline at end of file |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
98 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
99 diff -r a2392c293916 -r ef63ca68695b a |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
100 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
101 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
102 @@ -0,0 +1,3 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
103 +expand $Id$ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
104 +do not process $Id: |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
105 +xxx $ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
106 diff -r a2392c293916 -r ef63ca68695b b |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
107 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
108 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
109 @@ -0,0 +1,1 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
110 +ignore $Id$ |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
111 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
112 % remove notify config |
5816 | 113 % touch |
114 % status | |
115 % update | |
116 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
117 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
118 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 119 do not process $Id: |
120 xxx $ | |
121 ignore $Id$ | |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
122 % check whether expansion is filewise |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
123 % commit c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
124 adding c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
125 % force expansion |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
126 overwriting a expanding keywords |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
127 overwriting c expanding keywords |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
128 % compare changenodes in a c |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
129 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
130 do not process $Id: |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
131 xxx $ |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
132 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
133 tests for different changenodes |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
134 % qinit -c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
135 % qimport |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
136 % qcommit |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
137 % keywords should not be expanded in patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
138 # HG changeset patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
139 # User User Name <user@example.com> |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
140 # Date 1 0 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
141 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
142 # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
143 cndiff |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
144 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
145 diff -r ef63ca68695b -r 40a904bbbe4c c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
146 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
147 +++ b/c Thu Jan 01 00:00:01 1970 +0000 |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
148 @@ -0,0 +1,2 @@ |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
149 +$Id$ |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
150 +tests for different changenodes |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
151 % qpop |
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
9106
diff
changeset
|
152 popping mqtest.diff |
7627 | 153 patch queue now empty |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
154 % qgoto - should imply qpush |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
155 applying mqtest.diff |
7627 | 156 now at: mqtest.diff |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
157 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
158 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
159 tests for different changenodes |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
160 % qpop and move on |
9110
561ff8d9e4f0
mq: qpop now tells which patches are popped
Mads Kiilerich <mads@kiilerich.com>
parents:
9106
diff
changeset
|
161 popping mqtest.diff |
7627 | 162 patch queue now empty |
5816 | 163 % copy |
164 % kwfiles added | |
165 a | |
166 c | |
167 % commit | |
168 c | |
169 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 | |
170 overwriting c expanding keywords | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
171 committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f |
5816 | 172 % cat a c |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
173 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 174 do not process $Id: |
175 xxx $ | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
176 expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $ |
5816 | 177 do not process $Id: |
178 xxx $ | |
6328
991f7518c3f3
tests: remove some unnecessary sleeps
Matt Mackall <mpm@selenic.com>
parents:
6116
diff
changeset
|
179 % touch copied c |
5816 | 180 % status |
181 % kwfiles | |
182 a | |
183 c | |
184 % diff --rev | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
185 diff -r ef63ca68695b c |
5816 | 186 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
187 @@ -0,0 +1,3 @@ | |
5885
53be157543d4
keyword: avoid extra diffs when not comparing against working dir
Christian Ebert <blacktrash@gmx.net>
parents:
5884
diff
changeset
|
188 +expand $Id$ |
5816 | 189 +do not process $Id: |
190 +xxx $ | |
191 % rollback | |
192 rolling back last transaction | |
193 % status | |
194 A c | |
195 % update -C | |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
196 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5816 | 197 % custom keyword expansion |
198 % try with kwdemo | |
199 [extensions] | |
200 hgext.keyword = | |
201 [keyword] | |
202 * = | |
203 b = ignore | |
204 demo.txt = | |
205 [keywordmaps] | |
206 Xinfo = {author}: {desc} | |
207 $Xinfo: test: hg keyword config and expansion example $ | |
208 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
209 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 210 do not process $Id: |
211 xxx $ | |
212 ignore $Id$ | |
213 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
214 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
5816 | 215 do not process $Id: |
216 xxx $ | |
217 ignore $Id$ | |
218 a | |
219 % interrupted commit should not change state | |
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5816
diff
changeset
|
220 abort: empty commit message |
5816 | 221 % status |
222 M a | |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
223 ? c |
5816 | 224 ? log |
225 % commit | |
226 a | |
227 overwriting a expanding keywords | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
228 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
5816 | 229 % status |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
230 ? c |
6867
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
231 % verify |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
232 checking changesets |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
233 checking manifests |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
234 crosschecking files in changesets and manifests |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
235 checking files |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
236 3 files, 3 changesets, 4 total revisions |
5816 | 237 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
238 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 239 do not process $Id: |
240 xxx $ | |
241 $Xinfo: User Name <user@example.com>: firstline $ | |
242 ignore $Id$ | |
243 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
244 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 245 do not process $Id: |
246 xxx $ | |
247 $Xinfo: User Name <user@example.com>: firstline $ | |
248 ignore $Id$ | |
249 a | |
6667
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
250 % annotate |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
251 1: expand $Id$ |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
252 1: do not process $Id: |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
253 1: xxx $ |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
254 2: $Xinfo$ |
5816 | 255 % remove |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
256 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
5816 | 257 % status |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
258 ? c |
5816 | 259 % rollback |
260 rolling back last transaction | |
261 % status | |
262 R a | |
8518
3f4f14eab085
update --clean: do not unlink added files (issue575)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8496
diff
changeset
|
263 ? c |
5816 | 264 % revert a |
265 % cat a | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
266 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 267 do not process $Id: |
268 xxx $ | |
269 $Xinfo: User Name <user@example.com>: firstline $ | |
270 % clone to test incoming | |
271 requesting all changes | |
272 adding changesets | |
273 adding manifests | |
274 adding file changes | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
275 added 2 changesets with 3 changes to 3 files |
6338
0750f11152fe
clone: print "updating working directory" status message
Adrian Buehlmann <adrian@cadifra.com>
parents:
6328
diff
changeset
|
276 updating working directory |
5816 | 277 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
278 % incoming | |
5943
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
5894
diff
changeset
|
279 comparing with test-keyword/Test |
5816 | 280 searching for changes |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
281 changeset: 2:bb948857c743 |
5816 | 282 tag: tip |
283 user: User Name <user@example.com> | |
284 date: Thu Jan 01 00:00:02 1970 +0000 | |
285 summary: firstline | |
286 | |
287 % commit rejecttest | |
288 a | |
289 overwriting a expanding keywords | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
290 committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
5816 | 291 % export |
292 % import | |
293 applying ../rejecttest.diff | |
294 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
295 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
5816 | 296 do not process $Id: rejecttest |
297 xxx $ | |
298 $Xinfo: User Name <user@example.com>: rejects? $ | |
299 ignore $Id$ | |
300 | |
301 % rollback | |
302 rolling back last transaction | |
303 % clean update | |
304 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
305 % kwexpand/kwshrink on selected files | |
306 % copy a x/a | |
307 % kwexpand a | |
308 overwriting a expanding keywords | |
309 % kwexpand x/a should abort | |
6672
6004eedb13f4
keyword: mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
310 abort: outstanding uncommitted changes |
5816 | 311 x/a |
312 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e | |
313 overwriting x/a expanding keywords | |
6935
03916abdfb64
Have verbose and debug flag print the changeset rev and hash when committing.
Gilles Moris <gilles.moris@free.fr>
parents:
6934
diff
changeset
|
314 committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e |
5816 | 315 % cat a |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
316 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
5816 | 317 do not process $Id: |
318 xxx $ | |
319 $Xinfo: User Name <user@example.com>: xa $ | |
320 % kwshrink a inside directory x | |
321 overwriting x/a shrinking keywords | |
322 % cat a | |
323 expand $Id$ | |
324 do not process $Id: | |
325 xxx $ | |
326 $Xinfo$ | |
327 % kwexpand nonexistent | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
328 nonexistent: |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
329 % hg serve |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
330 % expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
331 % hgweb file |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
332 200 Script output follows |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
333 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
334 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 335 do not process $Id: |
336 xxx $ | |
337 $Xinfo: User Name <user@example.com>: firstline $ | |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
338 % no expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
339 % hgweb annotate |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
340 200 Script output follows |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
341 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
342 |
6968
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
343 user@1: expand $Id$ |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
344 user@1: do not process $Id: |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
345 user@1: xxx $ |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
346 user@2: $Xinfo$ |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
347 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
348 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
349 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
350 |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
351 % hgweb changeset |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
352 200 Script output follows |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
353 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
354 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
355 # HG changeset patch |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
356 # User User Name <user@example.com> |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
357 # Date 3 0 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
358 # Node ID cfa68229c1167443337266ebac453c73b1d5d16e |
7166
fb3df69aa785
hgweb: nodeids should be aligned in raw changesets
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7127
diff
changeset
|
359 # Parent bb948857c743469b22bbf51f7ec8112279ca5d83 |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
360 xa |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
361 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
362 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
363 +++ b/x/a Thu Jan 01 00:00:03 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
364 @@ -0,0 +1,4 @@ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
365 +expand $Id$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
366 +do not process $Id: |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
367 +xxx $ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
368 +$Xinfo$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
369 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
370 % hgweb filediff |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
371 200 Script output follows |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
372 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
373 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
374 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
375 +++ b/a Thu Jan 01 00:00:02 1970 +0000 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
376 @@ -1,3 +1,4 @@ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
377 expand $Id$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
378 do not process $Id: |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
379 xxx $ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
380 +$Xinfo$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
381 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
382 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
383 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
384 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
385 % errors encountered |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
386 % merge/resolve |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
387 % simplemerge |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
388 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
389 created new head |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
390 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
391 (branch merge, don't forget to commit) |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
392 $Id: m 8731e1dadc99 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
393 foo |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
394 % conflict |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
395 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
396 created new head |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
397 merging m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
398 warning: conflicts during merge. |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
399 merging m failed! |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
400 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
7821
9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Augie Fackler <durin42@gmail.com>
parents:
7627
diff
changeset
|
401 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
402 % keyword stays outside conflict zone |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
403 $Id$ |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
404 <<<<<<< local |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
405 bar |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
406 ======= |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
407 foo |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
408 >>>>>>> other |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
409 % resolve to local |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
410 $Id: m 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $ |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
411 bar |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
412 % switch off expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
413 % kwshrink with unknown file u |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
414 overwriting a shrinking keywords |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
415 overwriting m shrinking keywords |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
416 overwriting x/a shrinking keywords |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
417 % cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
418 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
419 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
420 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
421 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
422 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
423 % hg cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
424 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
425 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
426 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
427 $Xinfo: User Name <user@example.com>: firstline $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
428 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
429 a |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
430 % cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
431 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
432 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
433 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
434 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
435 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
436 % hg cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
437 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
438 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
439 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
440 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
441 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
442 a |