Mercurial > hg

comparison tests/test-keyword.out @ 10490:f2618cacb485 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filelog: sort meta entries, ensure deterministic order
author Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
date Tue, 16 Feb 2010 21:04:04 +0100
parents 19c3fefdaec9
children 4401b0dfee88
comparison
equal deleted inserted replaced
10489:3232dba5d521 10490:f2618cacb485
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 e22d299ac0c2 1970/01/01 00:00:01 user $ 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
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 cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $ 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
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 cfa68229c116 x/a 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:
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 8731e1dadc99 Thu, 01 Jan 1970 00:00:00 +0000 test $ 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
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 43dfd2854b5b Thu, 01 Jan 1970 00:00:00 +0000 test $ 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 1c4378f51c4d 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:7d855abcab87 431 changeset: 11:5a4da427c162
432 tag: tip 432 tag: tip
433 parent: 9:43dfd2854b5b 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 7d855abcab87 Thu, 01 Jan 1970 00:00:00 +0000 test $ 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