Mercurial > hg
annotate tests/test-keyword.out @ 7249:671b3e1eac2e
test-init: add test with format.usefncache=false
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Mon, 27 Oct 2008 13:22:45 +0100 |
parents | fb3df69aa785 |
children | fb32ae9c76e7 |
rev | line source |
---|---|
5816 | 1 % help |
2 keyword extension - keyword expansion in local repositories | |
3 | |
4 This extension expands RCS/CVS-like or self-customized $Keywords$ | |
5 in tracked text files selected by your configuration. | |
6 | |
7 Keywords are only expanded in local repositories and not stored in | |
8 the change history. The mechanism can be regarded as a convenience | |
9 for the current user or for archive distribution. | |
10 | |
11 Configuration is done in the [keyword] and [keywordmaps] sections | |
12 of hgrc files. | |
13 | |
14 Example: | |
15 | |
16 [keyword] | |
17 # expand keywords in every python file except those matching "x*" | |
18 **.py = | |
19 x* = ignore | |
20 | |
21 Note: the more specific you are in your filename patterns | |
22 the less you lose speed in huge repos. | |
23 | |
24 For [keywordmaps] template mapping and expansion demonstration and | |
25 control run "hg kwdemo". | |
26 | |
27 An additional date template filter {date|utcdate} is provided. | |
28 | |
29 The default template mappings (view with "hg kwdemo -d") can be replaced | |
30 with customized keywords and templates. | |
31 Again, run "hg kwdemo" to control the results of your config changes. | |
32 | |
33 Before changing/disabling active keywords, run "hg kwshrink" to avoid | |
34 the risk of inadvertedly storing expanded keywords in the change history. | |
35 | |
36 To force expansion after enabling it, or a configuration change, run | |
37 "hg kwexpand". | |
38 | |
5884
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
39 Also, when committing with the record extension or using mq's qrecord, be aware |
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
40 that keywords cannot be updated. Again, run "hg kwexpand" on the files in |
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
41 question to update keyword expansions after all changes have been checked in. |
a139f141dcae
keyword: support mq; handle (q)record more gracefully
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
42 |
5816 | 43 Expansions spanning more than one line and incremental expansions, |
44 like CVS' $Log$, are not supported. A keyword template map | |
45 "Log = {desc}" expands to the first line of the changeset description. | |
46 | |
47 list of commands: | |
48 | |
49 kwdemo print [keywordmaps] configuration and an expansion example | |
50 kwexpand expand keywords in working directory | |
51 kwfiles print files currently configured for keyword expansion | |
52 kwshrink revert expanded keywords in working directory | |
53 | |
7125
4a1ac535be1d
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6968
diff
changeset
|
54 enabled extensions: |
4a1ac535be1d
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6968
diff
changeset
|
55 |
4a1ac535be1d
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6968
diff
changeset
|
56 keyword keyword expansion in local repositories |
4a1ac535be1d
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6968
diff
changeset
|
57 mq patch management and development |
7127
9df67ee30ef5
help: better documentation intro for a few extensions
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7125
diff
changeset
|
58 notify hook extension to email notifications on commits/pushes |
7125
4a1ac535be1d
show enabled extensions in hg help
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6968
diff
changeset
|
59 |
5816 | 60 use "hg -v help keyword" to show aliases and global options |
61 % hg kwdemo | |
62 [extensions] | |
63 hgext.keyword = | |
64 [keyword] | |
65 * = | |
66 b = ignore | |
67 demo.txt = | |
68 [keywordmaps] | |
69 RCSFile = {file|basename},v | |
70 Author = {author|user} | |
71 Header = {root}/{file},v {node|short} {date|utcdate} {author|user} | |
72 Source = {root}/{file},v | |
73 Date = {date|utcdate} | |
74 Id = {file|basename},v {node|short} {date|utcdate} {author|user} | |
75 Revision = {node|short} | |
76 $RCSFile: demo.txt,v $ | |
77 $Author: test $ | |
78 $Header: /TMP/demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ | |
79 $Source: /TMP/demo.txt,v $ | |
80 $Date: 2000/00/00 00:00:00 $ | |
81 $Id: demo.txt,v xxxxxxxxxxxx 2000/00/00 00:00:00 test $ | |
82 $Revision: xxxxxxxxxxxx $ | |
83 [extensions] | |
84 hgext.keyword = | |
85 [keyword] | |
86 * = | |
87 b = ignore | |
88 demo.txt = | |
89 [keywordmaps] | |
90 Branch = {branches} | |
91 $Branch: demobranch $ | |
92 % 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
|
93 pulling from test-keyword.hg |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
94 requesting all changes |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
95 adding changesets |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
96 adding manifests |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
97 adding file changes |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
98 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
|
99 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5816 | 100 % cat |
101 expand $Id$ | |
102 do not process $Id: | |
103 xxx $ | |
104 ignore $Id$ | |
105 % addremove | |
106 adding a | |
107 adding b | |
108 % status | |
109 A a | |
110 A b | |
111 % default keyword expansion including commit hook | |
112 % interrupted commit should not change state or run commit hook | |
113 a | |
114 b | |
115 transaction abort! | |
116 rollback completed | |
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5816
diff
changeset
|
117 abort: empty commit message |
5816 | 118 % status |
119 A a | |
120 A b | |
121 % commit | |
122 a | |
123 b | |
124 overwriting a expanding keywords | |
125 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
|
126 committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
5816 | 127 % status |
128 ? hooktest | |
129 % identify | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
130 ef63ca68695b |
5816 | 131 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
132 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 133 do not process $Id: |
134 xxx $ | |
135 ignore $Id$ | |
136 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
137 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 138 do not process $Id: |
139 xxx $ | |
140 ignore $Id$ | |
141 a | |
142 % diff a hooktest | |
143 % removing commit hook from config | |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
144 % bundle |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
145 2 changesets found |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
146 % 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
|
147 % 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
|
148 % pull from bundle |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
149 pulling from ../kw.hg |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
150 requesting all changes |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
151 adding changesets |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
152 adding manifests |
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
153 adding file changes |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
154 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
|
155 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
156 diff -r 000000000000 -r a2392c293916 sym |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
157 --- /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
|
158 +++ 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
|
159 @@ -0,0 +1,1 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
160 +a |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
161 \ No newline at end of file |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
162 |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
163 diff -r a2392c293916 -r ef63ca68695b a |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
164 --- /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
|
165 +++ 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
|
166 @@ -0,0 +1,3 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
167 +expand $Id$ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
168 +do not process $Id: |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
169 +xxx $ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
170 diff -r a2392c293916 -r ef63ca68695b b |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
171 --- /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
|
172 +++ 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
|
173 @@ -0,0 +1,1 @@ |
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
174 +ignore $Id$ |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
175 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
|
176 % remove notify config |
5816 | 177 % touch |
178 % status | |
179 % update | |
180 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
181 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
182 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 183 do not process $Id: |
184 xxx $ | |
185 ignore $Id$ | |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
186 % check whether expansion is filewise |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
187 % commit c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
188 adding c |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
189 % force expansion |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
190 overwriting a expanding keywords |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
191 overwriting c expanding keywords |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
192 % compare changenodes in a c |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
193 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
|
194 do not process $Id: |
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
195 xxx $ |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
196 $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
|
197 tests for different changenodes |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
198 % qinit -c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
199 % qimport |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5943
diff
changeset
|
200 % qcommit |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
201 % keywords should not be expanded in patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
202 # HG changeset patch |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
203 # User User Name <user@example.com> |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
204 # Date 1 0 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
205 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
206 # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
207 cndiff |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
208 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
209 diff -r ef63ca68695b -r 40a904bbbe4c c |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
210 --- /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
|
211 +++ 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
|
212 @@ -0,0 +1,2 @@ |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
213 +$Id$ |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
214 +tests for different changenodes |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
215 % qpop |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
216 Patch queue now empty |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
217 % qgoto - should imply qpush |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
218 applying mqtest.diff |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
219 Now at: mqtest.diff |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
220 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
221 $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
|
222 tests for different changenodes |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
223 % qpop and move on |
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5885
diff
changeset
|
224 Patch queue now empty |
5816 | 225 % copy |
226 % kwfiles added | |
227 a | |
228 c | |
229 % commit | |
230 c | |
231 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 | |
232 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
|
233 committed changeset 2:e22d299ac0c2bd8897b3df5114374b9e4d4ca62f |
5816 | 234 % cat a c |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
235 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 236 do not process $Id: |
237 xxx $ | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
238 expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $ |
5816 | 239 do not process $Id: |
240 xxx $ | |
6328
991f7518c3f3
tests: remove some unnecessary sleeps
Matt Mackall <mpm@selenic.com>
parents:
6116
diff
changeset
|
241 % touch copied c |
5816 | 242 % status |
243 % kwfiles | |
244 a | |
245 c | |
246 % diff --rev | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
247 diff -r ef63ca68695b c |
5816 | 248 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
249 @@ -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
|
250 +expand $Id$ |
5816 | 251 +do not process $Id: |
252 +xxx $ | |
253 % rollback | |
254 rolling back last transaction | |
255 % status | |
256 A c | |
257 % update -C | |
258 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
259 % custom keyword expansion | |
260 % try with kwdemo | |
261 [extensions] | |
262 hgext.keyword = | |
263 [keyword] | |
264 * = | |
265 b = ignore | |
266 demo.txt = | |
267 [keywordmaps] | |
268 Xinfo = {author}: {desc} | |
269 $Xinfo: test: hg keyword config and expansion example $ | |
270 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
271 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
5816 | 272 do not process $Id: |
273 xxx $ | |
274 ignore $Id$ | |
275 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
276 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
5816 | 277 do not process $Id: |
278 xxx $ | |
279 ignore $Id$ | |
280 a | |
281 % interrupted commit should not change state | |
282 transaction abort! | |
283 rollback completed | |
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5816
diff
changeset
|
284 abort: empty commit message |
5816 | 285 % status |
286 M a | |
287 ? log | |
288 % commit | |
289 a | |
290 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
|
291 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
5816 | 292 % status |
6867
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
293 % verify |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
294 checking changesets |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
295 checking manifests |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
296 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
|
297 checking files |
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6672
diff
changeset
|
298 3 files, 3 changesets, 4 total revisions |
5816 | 299 % cat |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
300 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 301 do not process $Id: |
302 xxx $ | |
303 $Xinfo: User Name <user@example.com>: firstline $ | |
304 ignore $Id$ | |
305 % hg cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
306 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 307 do not process $Id: |
308 xxx $ | |
309 $Xinfo: User Name <user@example.com>: firstline $ | |
310 ignore $Id$ | |
311 a | |
6667
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
312 % annotate |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
313 1: expand $Id$ |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
314 1: do not process $Id: |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
315 1: xxx $ |
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
316 2: $Xinfo$ |
5816 | 317 % 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
|
318 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
5816 | 319 % status |
320 % rollback | |
321 rolling back last transaction | |
322 % status | |
323 R a | |
324 % revert a | |
325 % cat a | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
326 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 327 do not process $Id: |
328 xxx $ | |
329 $Xinfo: User Name <user@example.com>: firstline $ | |
330 % clone to test incoming | |
331 requesting all changes | |
332 adding changesets | |
333 adding manifests | |
334 adding file changes | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
335 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
|
336 updating working directory |
5816 | 337 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
338 % incoming | |
5943
ffaf2419de44
Ensure that absolutized paths from hgrc do not contain ../ segments.
Jesse Glick <jesse.glick@sun.com>
parents:
5894
diff
changeset
|
339 comparing with test-keyword/Test |
5816 | 340 searching for changes |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
341 changeset: 2:bb948857c743 |
5816 | 342 tag: tip |
343 user: User Name <user@example.com> | |
344 date: Thu Jan 01 00:00:02 1970 +0000 | |
345 summary: firstline | |
346 | |
347 % commit rejecttest | |
348 a | |
349 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
|
350 committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
5816 | 351 % export |
352 % import | |
353 applying ../rejecttest.diff | |
354 % cat | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
355 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
5816 | 356 do not process $Id: rejecttest |
357 xxx $ | |
358 $Xinfo: User Name <user@example.com>: rejects? $ | |
359 ignore $Id$ | |
360 | |
361 % rollback | |
362 rolling back last transaction | |
363 % clean update | |
364 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
365 % kwexpand/kwshrink on selected files | |
366 % copy a x/a | |
367 % kwexpand a | |
368 overwriting a expanding keywords | |
369 % kwexpand x/a should abort | |
6672
6004eedb13f4
keyword: mimic cmdutil.bail_if_changed even more
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
370 abort: outstanding uncommitted changes |
5816 | 371 x/a |
372 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e | |
373 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
|
374 committed changeset 3:cfa68229c1167443337266ebac453c73b1d5d16e |
5816 | 375 % cat a |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
376 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
5816 | 377 do not process $Id: |
378 xxx $ | |
379 $Xinfo: User Name <user@example.com>: xa $ | |
380 % kwshrink a inside directory x | |
381 overwriting x/a shrinking keywords | |
382 % cat a | |
383 expand $Id$ | |
384 do not process $Id: | |
385 xxx $ | |
386 $Xinfo$ | |
387 % kwexpand nonexistent | |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
388 nonexistent: |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
389 % hg serve |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
390 % expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
391 % hgweb file |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
392 200 Script output follows |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
393 |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
394 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
5816 | 395 do not process $Id: |
396 xxx $ | |
397 $Xinfo: User Name <user@example.com>: firstline $ | |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
398 % no expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
399 % hgweb annotate |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
400 200 Script output follows |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
401 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
402 |
6968
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
403 user@1: expand $Id$ |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
404 user@1: do not process $Id: |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
405 user@1: xxx $ |
91f6370c433c
fix test output broken by a04d8cadb6af
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6936
diff
changeset
|
406 user@2: $Xinfo$ |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
407 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
408 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
409 |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
410 |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
411 % hgweb changeset |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
412 200 Script output follows |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
413 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
414 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
415 # HG changeset patch |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
416 # User User Name <user@example.com> |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
417 # Date 3 0 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
418 # Node ID cfa68229c1167443337266ebac453c73b1d5d16e |
7166
fb3df69aa785
hgweb: nodeids should be aligned in raw changesets
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7127
diff
changeset
|
419 # Parent bb948857c743469b22bbf51f7ec8112279ca5d83 |
6354
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
420 xa |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
421 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
422 --- /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
|
423 +++ 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
|
424 @@ -0,0 +1,4 @@ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
425 +expand $Id$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
426 +do not process $Id: |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
427 +xxx $ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
428 +$Xinfo$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
429 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
430 % hgweb filediff |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
431 200 Script output follows |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
432 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
433 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
434 --- 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
|
435 +++ 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
|
436 @@ -1,3 +1,4 @@ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
437 expand $Id$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
438 do not process $Id: |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
439 xxx $ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
440 +$Xinfo$ |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
441 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
442 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
443 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
444 |
57a47660b319
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6338
diff
changeset
|
445 % errors encountered |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
446 % merge/resolve |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
447 % simplemerge |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
448 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
|
449 created new head |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
450 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
|
451 (branch merge, don't forget to commit) |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
452 $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
|
453 foo |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
454 % conflict |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
455 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
|
456 created new head |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
457 merging m |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
458 warning: conflicts during merge. |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
459 merging m failed! |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
460 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
461 use 'hg resolve' to retry unresolved file merges |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
462 % keyword stays outside conflict zone |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
463 $Id$ |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
464 <<<<<<< local |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
465 bar |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
466 ======= |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
467 foo |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
468 >>>>>>> other |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
469 % resolve to local |
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
470 $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
|
471 bar |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
472 % switch off expansion |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
473 % kwshrink with unknown file u |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
474 overwriting a shrinking keywords |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6932
diff
changeset
|
475 overwriting m shrinking keywords |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
476 overwriting x/a shrinking keywords |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
477 % cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
478 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
479 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
480 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
481 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
482 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
483 % hg cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
484 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
|
485 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
486 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
487 $Xinfo: User Name <user@example.com>: firstline $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
488 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
489 a |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
490 % cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
491 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
492 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
493 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
494 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
495 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
496 % hg cat |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
497 expand $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
498 do not process $Id: |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
499 xxx $ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
500 $Xinfo$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
501 ignore $Id$ |
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
502 a |