Show More
@@ -1821,6 +1821,8 b' def _logrevs(repo, opts):' | |||||
1821 | follow = opts.get('follow') or opts.get('follow_first') |
|
1821 | follow = opts.get('follow') or opts.get('follow_first') | |
1822 | if opts.get('rev'): |
|
1822 | if opts.get('rev'): | |
1823 | revs = scmutil.revrange(repo, opts['rev']) |
|
1823 | revs = scmutil.revrange(repo, opts['rev']) | |
|
1824 | elif follow and repo.dirstate.p1() == nullid: | |||
|
1825 | revs = revset.baseset() | |||
1824 | elif follow: |
|
1826 | elif follow: | |
1825 | revs = repo.revs('reverse(:.)') |
|
1827 | revs = repo.revs('reverse(:.)') | |
1826 | else: |
|
1828 | else: |
@@ -1767,6 +1767,13 b' Test --follow and multiple files' | |||||
1767 | nodetag 1 |
|
1767 | nodetag 1 | |
1768 | nodetag 0 |
|
1768 | nodetag 0 | |
1769 |
|
1769 | |||
|
1770 | Test --follow null parent | |||
|
1771 | ||||
|
1772 | $ hg up -q null | |||
|
1773 | $ testlog -f | |||
|
1774 | [] | |||
|
1775 | [] | |||
|
1776 | ||||
1770 | Test --follow-first |
|
1777 | Test --follow-first | |
1771 |
|
1778 | |||
1772 | $ hg up -q 3 |
|
1779 | $ hg up -q 3 |
@@ -82,6 +82,10 b' follow' | |||||
82 | port:1:2:+:eggs:export |
|
82 | port:1:2:+:eggs:export | |
83 | port:0:1:+:spam:import |
|
83 | port:0:1:+:spam:import | |
84 |
|
84 | |||
|
85 | $ hg up -q null | |||
|
86 | $ hg grep -f port | |||
|
87 | [1] | |||
|
88 | ||||
85 |
$ |
|
89 | $ cd .. | |
86 |
$ |
|
90 | $ hg init t2 | |
87 | $ cd t2 |
|
91 | $ cd t2 |
@@ -672,10 +672,17 b' log -f -r null' | |||||
672 |
|
672 | |||
673 |
|
673 | |||
674 |
|
674 | |||
|
675 | log -f with null parent | |||
|
676 | ||||
|
677 | $ hg up -C null | |||
|
678 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |||
|
679 | $ hg log -f | |||
|
680 | ||||
|
681 | ||||
675 | log -r . with two parents |
|
682 | log -r . with two parents | |
676 |
|
683 | |||
677 | $ hg up -C 3 |
|
684 | $ hg up -C 3 | |
678 |
2 files updated, 0 files merged, |
|
685 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
679 | $ hg merge tip |
|
686 | $ hg merge tip | |
680 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
687 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
681 | (branch merge, don't forget to commit) |
|
688 | (branch merge, don't forget to commit) |
General Comments 0
You need to be logged in to leave comments.
Login now