Show More
@@ -2533,7 +2533,11 b' def log(ui, repo, *pats, **opts):' | |||||
2533 |
|
2533 | |||
2534 | revmatchfn = None |
|
2534 | revmatchfn = None | |
2535 | if opts.get('patch') or opts.get('stat'): |
|
2535 | if opts.get('patch') or opts.get('stat'): | |
2536 | revmatchfn = cmdutil.match(repo, fns, default='path') |
|
2536 | if opts.get('follow') or opts.get('follow_first'): | |
|
2537 | # note: this might be wrong when following through merges | |||
|
2538 | revmatchfn = cmdutil.match(repo, fns, default='path') | |||
|
2539 | else: | |||
|
2540 | revmatchfn = matchfn | |||
2537 |
|
2541 | |||
2538 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
|
2542 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) | |
2539 |
|
2543 |
@@ -194,5 +194,26 b" echo '% log -p -R repo'" | |||||
194 | cd dir |
|
194 | cd dir | |
195 | hg log -p -R .. ../a |
|
195 | hg log -p -R .. ../a | |
196 |
|
196 | |||
|
197 | cd .. | |||
197 |
|
198 | |||
198 | exit 0 |
|
199 | echo '% issue2383' | |
|
200 | ||||
|
201 | hg init issue2383 | |||
|
202 | cd issue2383 | |||
|
203 | echo a > a | |||
|
204 | hg ci -Am0 | |||
|
205 | echo b > b | |||
|
206 | hg ci -Am1 | |||
|
207 | hg co 0 | |||
|
208 | echo b > a | |||
|
209 | hg ci -m2 | |||
|
210 | hg merge | |||
|
211 | echo c > a | |||
|
212 | hg ci -m3 | |||
|
213 | echo | |||
|
214 | echo % diff | |||
|
215 | hg diff --rev 2:3 | |||
|
216 | echo | |||
|
217 | echo % log | |||
|
218 | hg log -vpr 3 | |||
|
219 | cd .. |
@@ -585,3 +585,48 b' diff -r 000000000000 -r 24427303d56f a' | |||||
585 | @@ -0,0 +1,1 @@ |
|
585 | @@ -0,0 +1,1 @@ | |
586 | +a |
|
586 | +a | |
587 |
|
587 | |||
|
588 | % issue2383 | |||
|
589 | adding a | |||
|
590 | adding b | |||
|
591 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
592 | created new head | |||
|
593 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
594 | (branch merge, don't forget to commit) | |||
|
595 | ||||
|
596 | % diff | |||
|
597 | diff -r b09be438c43a -r 8e07aafe1edc a | |||
|
598 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |||
|
599 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |||
|
600 | @@ -1,1 +1,1 @@ | |||
|
601 | -b | |||
|
602 | +c | |||
|
603 | diff -r b09be438c43a -r 8e07aafe1edc b | |||
|
604 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
605 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |||
|
606 | @@ -0,0 +1,1 @@ | |||
|
607 | +b | |||
|
608 | ||||
|
609 | % log | |||
|
610 | changeset: 3:8e07aafe1edc | |||
|
611 | tag: tip | |||
|
612 | parent: 2:b09be438c43a | |||
|
613 | parent: 1:925d80f479bb | |||
|
614 | user: test | |||
|
615 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
616 | files: a | |||
|
617 | description: | |||
|
618 | 3 | |||
|
619 | ||||
|
620 | ||||
|
621 | diff -r b09be438c43a -r 8e07aafe1edc a | |||
|
622 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | |||
|
623 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |||
|
624 | @@ -1,1 +1,1 @@ | |||
|
625 | -b | |||
|
626 | +c | |||
|
627 | diff -r b09be438c43a -r 8e07aafe1edc b | |||
|
628 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
629 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |||
|
630 | @@ -0,0 +1,1 @@ | |||
|
631 | +b | |||
|
632 |
General Comments 0
You need to be logged in to leave comments.
Login now