Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-log @ 4510:e0bc2c575044

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue a warning if "-r ." is used with two working directory parents. Rationale for not aborting instead: The first parent is usually more important as it is the local branch during a merge and commands like 'hg diff' and 'hg diff -r.' behave still identically (except for the warning of course). Added a test for log -r. with one and two parents.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 06 Jun 2007 19:05:18 +0200
parents f80cf8b7bbd9
children
comparison
equal deleted inserted replaced
4509:9d1380e5c8c5 4510:e0bc2c575044
45 hg log -pv d 45 hg log -pv d
46 46
47 # log --follow tests 47 # log --follow tests
48 hg init ../follow 48 hg init ../follow
49 cd ../follow 49 cd ../follow
50
50 echo base > base 51 echo base > base
51 hg ci -Ambase -d '1 0' 52 hg ci -Ambase -d '1 0'
52 53
53 echo r1 >> base 54 echo r1 >> base
54 hg ci -Amr1 -d '1 0' 55 hg ci -Amr1 -d '1 0'
69 echo % log -f -r 1:tip 70 echo % log -f -r 1:tip
70 hg log -f -r 1:tip 71 hg log -f -r 1:tip
71 72
72 hg up -C 3 73 hg up -C 3
73 hg merge tip 74 hg merge tip
75
76 echo % log -r . with two parents
77 hg log -r .
78
74 hg ci -mm12 -d '1 0' 79 hg ci -mm12 -d '1 0'
80
81 echo % log -r . with one parent
82 hg log -r .
75 83
76 echo postm >> b1 84 echo postm >> b1
77 hg ci -Amb1.1 -d'1 0' 85 hg ci -Amb1.1 -d'1 0'
78 86
79 echo % log --follow-first 87 echo % log --follow-first