Mercurial > hg
comparison tests/test-keyword.out @ 8518:3f4f14eab085
update --clean: do not unlink added files (issue575)
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 19 May 2009 03:59:58 +0200 |
parents | a21605de1509 |
children | aea3a23151bd |
comparison
equal
deleted
inserted
replaced
8517:110763cc3ab0 | 8518:3f4f14eab085 |
---|---|
251 % rollback | 251 % rollback |
252 rolling back last transaction | 252 rolling back last transaction |
253 % status | 253 % status |
254 A c | 254 A c |
255 % update -C | 255 % update -C |
256 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 256 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
257 % custom keyword expansion | 257 % custom keyword expansion |
258 % try with kwdemo | 258 % try with kwdemo |
259 [extensions] | 259 [extensions] |
260 hgext.keyword = | 260 hgext.keyword = |
261 [keyword] | 261 [keyword] |
278 a | 278 a |
279 % interrupted commit should not change state | 279 % interrupted commit should not change state |
280 abort: empty commit message | 280 abort: empty commit message |
281 % status | 281 % status |
282 M a | 282 M a |
283 ? c | |
283 ? log | 284 ? log |
284 % commit | 285 % commit |
285 a | 286 a |
286 overwriting a expanding keywords | 287 overwriting a expanding keywords |
287 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 | 288 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
288 % status | 289 % status |
290 ? c | |
289 % verify | 291 % verify |
290 checking changesets | 292 checking changesets |
291 checking manifests | 293 checking manifests |
292 crosschecking files in changesets and manifests | 294 crosschecking files in changesets and manifests |
293 checking files | 295 checking files |
311 1: xxx $ | 313 1: xxx $ |
312 2: $Xinfo$ | 314 2: $Xinfo$ |
313 % remove | 315 % remove |
314 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 | 316 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
315 % status | 317 % status |
318 ? c | |
316 % rollback | 319 % rollback |
317 rolling back last transaction | 320 rolling back last transaction |
318 % status | 321 % status |
319 R a | 322 R a |
323 ? c | |
320 % revert a | 324 % revert a |
321 % cat a | 325 % cat a |
322 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ | 326 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
323 do not process $Id: | 327 do not process $Id: |
324 xxx $ | 328 xxx $ |