tests/test-log.out
author Martin Geisler <mg@lazybytes.net>
Tue, 17 Aug 2010 16:53:03 +0200
changeset 11916 d1ea16ca6520
parent 11899 99cafcae25d9
permissions -rw-r--r--
tests: unify test-subrepo-svn
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     1
adding a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     2
changeset:   0:8580ff50825a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     3
user:        test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     4
date:        Thu Jan 01 00:00:01 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     5
summary:     a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     6
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     7
% -f, directory
7404
07cb58b8c843 Improved error message for log --follow
Brendan Cully <brendan@kublai.com>
parents: 7062
diff changeset
     8
abort: cannot follow nonexistent file: "dir"
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
     9
% -f, but no args
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10061
diff changeset
    10
changeset:   4:66c1345dc4f9
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    11
tag:         tip
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    12
user:        test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    13
date:        Thu Jan 01 00:00:05 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    14
summary:     e
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    15
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10061
diff changeset
    16
changeset:   3:7c6c671bb7cc
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    17
user:        test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    18
date:        Thu Jan 01 00:00:04 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    19
summary:     d
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    20
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10061
diff changeset
    21
changeset:   2:41dd4284081e
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    22
user:        test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    23
date:        Thu Jan 01 00:00:03 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    24
summary:     c
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    25
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10061
diff changeset
    26
changeset:   1:784de7cef101
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    27
user:        test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    28
date:        Thu Jan 01 00:00:02 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    29
summary:     b
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    30
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    31
changeset:   0:8580ff50825a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    32
user:        test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    33
date:        Thu Jan 01 00:00:01 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    34
summary:     a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    35
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    36
% one rename
2966
fb493241d7f6 Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents: 2901
diff changeset
    37
changeset:   0:8580ff50825a
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    38
user:        test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    39
date:        Thu Jan 01 00:00:01 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    40
files:       a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    41
description:
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    42
a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    43
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    44
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    45
% many renames
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10061
diff changeset
    46
changeset:   4:66c1345dc4f9
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    47
tag:         tip
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    48
user:        test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    49
date:        Thu Jan 01 00:00:05 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    50
files:       dir/b e
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    51
description:
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    52
e
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    53
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    54
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10061
diff changeset
    55
changeset:   2:41dd4284081e
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    56
user:        test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    57
date:        Thu Jan 01 00:00:03 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    58
files:       b dir/b
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    59
description:
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    60
c
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    61
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    62
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10061
diff changeset
    63
changeset:   1:784de7cef101
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    64
user:        test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    65
date:        Thu Jan 01 00:00:02 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    66
files:       b
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    67
description:
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    68
b
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    69
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    70
2966
fb493241d7f6 Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents: 2901
diff changeset
    71
changeset:   0:8580ff50825a
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    72
user:        test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    73
date:        Thu Jan 01 00:00:01 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    74
files:       a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    75
description:
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    76
a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    77
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
    78
11562
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    79
% log -pf dir/b
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    80
changeset:   2:41dd4284081e
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    81
user:        test
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    82
date:        Thu Jan 01 00:00:03 1970 +0000
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    83
summary:     c
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    84
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    85
diff -r 784de7cef101 -r 41dd4284081e dir/b
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    86
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    87
+++ b/dir/b	Thu Jan 01 00:00:03 1970 +0000
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    88
@@ -0,0 +1,1 @@
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    89
+a
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    90
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    91
changeset:   1:784de7cef101
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    92
user:        test
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    93
date:        Thu Jan 01 00:00:02 1970 +0000
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    94
summary:     b
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    95
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    96
diff -r 8580ff50825a -r 784de7cef101 b
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    97
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    98
+++ b/b	Thu Jan 01 00:00:02 1970 +0000
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
    99
@@ -0,0 +1,1 @@
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   100
+a
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   101
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   102
changeset:   0:8580ff50825a
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   103
user:        test
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   104
date:        Thu Jan 01 00:00:01 1970 +0000
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   105
summary:     a
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   106
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   107
diff -r 000000000000 -r 8580ff50825a a
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   108
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   109
+++ b/a	Thu Jan 01 00:00:01 1970 +0000
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   110
@@ -0,0 +1,1 @@
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   111
+a
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   112
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   113
% log -vf dir/b
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   114
changeset:   2:41dd4284081e
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   115
user:        test
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   116
date:        Thu Jan 01 00:00:03 1970 +0000
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   117
files:       b dir/b
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   118
description:
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   119
c
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   120
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   121
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   122
changeset:   1:784de7cef101
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   123
user:        test
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   124
date:        Thu Jan 01 00:00:02 1970 +0000
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   125
files:       b
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   126
description:
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   127
b
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   128
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   129
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   130
changeset:   0:8580ff50825a
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   131
user:        test
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   132
date:        Thu Jan 01 00:00:01 1970 +0000
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   133
files:       a
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   134
description:
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   135
a
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   136
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
   137
10060
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents: 9421
diff changeset
   138
% log copies with --copies
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents: 9421
diff changeset
   139
4 e (dir/b)
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents: 9421
diff changeset
   140
3 b (a)
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents: 9421
diff changeset
   141
2 dir/b (b)
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents: 9421
diff changeset
   142
1 b (a)
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents: 9421
diff changeset
   143
0 
10061
9e2ab10728a2 Make {file_copies} usable as a --template key
Patrick Mezard <pmezard@gmail.com>
parents: 10060
diff changeset
   144
% log copies switch without --copies, with old filecopy template
10060
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents: 9421
diff changeset
   145
4 
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents: 9421
diff changeset
   146
3 
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents: 9421
diff changeset
   147
2 
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents: 9421
diff changeset
   148
1 
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents: 9421
diff changeset
   149
0 
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch}
Patrick Mezard <pmezard@gmail.com>
parents: 9421
diff changeset
   150
% log copies switch with --copies
3197
e18c3d08528d Show copies in hg log.
Brendan Cully <brendan@kublai.com>
parents: 2966
diff changeset
   151
4 e (dir/b)
e18c3d08528d Show copies in hg log.
Brendan Cully <brendan@kublai.com>
parents: 2966
diff changeset
   152
3 b (a)
e18c3d08528d Show copies in hg log.
Brendan Cully <brendan@kublai.com>
parents: 2966
diff changeset
   153
2 dir/b (b)
e18c3d08528d Show copies in hg log.
Brendan Cully <brendan@kublai.com>
parents: 2966
diff changeset
   154
1 b (a)
e18c3d08528d Show copies in hg log.
Brendan Cully <brendan@kublai.com>
parents: 2966
diff changeset
   155
0 
10776
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   156
% log copies with hardcoded style and with --style=default
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   157
changeset:   4:66c1345dc4f9
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   158
tag:         tip
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   159
user:        test
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   160
date:        Thu Jan 01 00:00:05 1970 +0000
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   161
files:       dir/b e
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   162
copies:      e (dir/b)
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   163
description:
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   164
e
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   165
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   166
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   167
changeset:   4:66c1345dc4f9
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   168
tag:         tip
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   169
user:        test
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   170
date:        Thu Jan 01 00:00:05 1970 +0000
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   171
files:       dir/b e
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   172
copies:      e (dir/b)
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   173
description:
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   174
e
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   175
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10490
diff changeset
   176
3383
c7c6f1a45348 Test case for log --copies on non-linear manifests (issue391)
Brendan Cully <brendan@kublai.com>
parents: 3197
diff changeset
   177
% log copies, non-linear manifest
c7c6f1a45348 Test case for log --copies on non-linear manifests (issue391)
Brendan Cully <brendan@kublai.com>
parents: 3197
diff changeset
   178
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
c7c6f1a45348 Test case for log --copies on non-linear manifests (issue391)
Brendan Cully <brendan@kublai.com>
parents: 3197
diff changeset
   179
adding foo
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6228
diff changeset
   180
created new head
3383
c7c6f1a45348 Test case for log --copies on non-linear manifests (issue391)
Brendan Cully <brendan@kublai.com>
parents: 3197
diff changeset
   181
5 e (dir/b)
5811
180a3eee4b75 Fix copies reporting in log and convert.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4510
diff changeset
   182
% log copies, execute bit set
180a3eee4b75 Fix copies reporting in log and convert.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4510
diff changeset
   183
6 
3837
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   184
% log -p d
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10061
diff changeset
   185
changeset:   3:7c6c671bb7cc
3837
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   186
user:        test
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   187
date:        Thu Jan 01 00:00:04 1970 +0000
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   188
files:       a b d
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   189
description:
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   190
d
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   191
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   192
10490
f2618cacb485 filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents: 10061
diff changeset
   193
diff -r 41dd4284081e -r 7c6c671bb7cc d
3837
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   194
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   195
+++ b/d	Thu Jan 01 00:00:04 1970 +0000
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   196
@@ -0,0 +1,1 @@
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   197
+a
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
   198
11631
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   199
% log --removed file
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   200
changeset:   3:7c6c671bb7cc
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   201
user:        test
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   202
date:        Thu Jan 01 00:00:04 1970 +0000
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   203
files:       a b d
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   204
description:
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   205
d
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   206
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   207
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   208
changeset:   0:8580ff50825a
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   209
user:        test
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   210
date:        Thu Jan 01 00:00:01 1970 +0000
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   211
files:       a
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   212
description:
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   213
a
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   214
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   215
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   216
% log --removed revrange file
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   217
changeset:   0:8580ff50825a
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   218
user:        test
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   219
date:        Thu Jan 01 00:00:01 1970 +0000
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   220
files:       a
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   221
description:
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   222
a
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   223
dbb98d8fbcaf log: slowpath: only walk specified revision range during preparation
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11562
diff changeset
   224
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   225
adding base
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   226
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   227
adding b1
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6228
diff changeset
   228
created new head
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   229
% log -f
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   230
changeset:   3:e62f78d544b4
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   231
tag:         tip
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   232
parent:      1:3d5bf5654eda
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   233
user:        test
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   234
date:        Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   235
summary:     b1
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   236
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   237
changeset:   1:3d5bf5654eda
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   238
user:        test
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   239
date:        Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   240
summary:     r1
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   241
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   242
changeset:   0:67e992f2c4f3
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   243
user:        test
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   244
date:        Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   245
summary:     base
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   246
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   247
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   248
adding b2
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6228
diff changeset
   249
created new head
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   250
% log -f -r 1:tip
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   251
changeset:   1:3d5bf5654eda
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   252
user:        test
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   253
date:        Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   254
summary:     r1
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   255
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   256
changeset:   2:60c670bf5b30
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   257
user:        test
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   258
date:        Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   259
summary:     r2
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   260
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   261
changeset:   3:e62f78d544b4
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   262
parent:      1:3d5bf5654eda
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   263
user:        test
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   264
date:        Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   265
summary:     b1
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   266
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   267
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   268
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   269
(branch merge, don't forget to commit)
4510
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   270
% log -r . with two parents
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   271
changeset:   3:e62f78d544b4
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   272
parent:      1:3d5bf5654eda
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   273
user:        test
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   274
date:        Thu Jan 01 00:00:01 1970 +0000
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   275
summary:     b1
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   276
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   277
% log -r . with one parent
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   278
changeset:   5:302e9dd6890d
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   279
tag:         tip
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   280
parent:      3:e62f78d544b4
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   281
parent:      4:ddb82e70d1a1
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   282
user:        test
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   283
date:        Thu Jan 01 00:00:01 1970 +0000
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   284
summary:     m12
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
   285
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   286
% log --follow-first
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   287
changeset:   6:2404bbcab562
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   288
tag:         tip
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   289
user:        test
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   290
date:        Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   291
summary:     b1.1
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   292
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   293
changeset:   5:302e9dd6890d
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   294
parent:      3:e62f78d544b4
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   295
parent:      4:ddb82e70d1a1
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   296
user:        test
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   297
date:        Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   298
summary:     m12
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   299
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   300
changeset:   3:e62f78d544b4
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   301
parent:      1:3d5bf5654eda
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   302
user:        test
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   303
date:        Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   304
summary:     b1
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   305
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   306
changeset:   1:3d5bf5654eda
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   307
user:        test
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   308
date:        Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   309
summary:     r1
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   310
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   311
changeset:   0:67e992f2c4f3
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   312
user:        test
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   313
date:        Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   314
summary:     base
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
   315
2901
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   316
% log -P 2
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   317
changeset:   6:2404bbcab562
2901
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   318
tag:         tip
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   319
user:        test
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   320
date:        Thu Jan 01 00:00:01 1970 +0000
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   321
summary:     b1.1
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   322
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   323
changeset:   5:302e9dd6890d
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   324
parent:      3:e62f78d544b4
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   325
parent:      4:ddb82e70d1a1
2901
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   326
user:        test
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   327
date:        Thu Jan 01 00:00:01 1970 +0000
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   328
summary:     m12
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   329
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   330
changeset:   4:ddb82e70d1a1
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   331
parent:      0:67e992f2c4f3
2901
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   332
user:        test
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   333
date:        Thu Jan 01 00:00:01 1970 +0000
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   334
summary:     b2
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   335
4180
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   336
changeset:   3:e62f78d544b4
f80cf8b7bbd9 Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents: 4167
diff changeset
   337
parent:      1:3d5bf5654eda
2901
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   338
user:        test
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   339
date:        Thu Jan 01 00:00:01 1970 +0000
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   340
summary:     b1
9826af4841ef Test for log --prune.
Brendan Cully <brendan@kublai.com>
parents: 2785
diff changeset
   341
7762
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   342
% log -r tip -p --git
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   343
changeset:   6:2404bbcab562
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   344
tag:         tip
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   345
user:        test
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   346
date:        Thu Jan 01 00:00:01 1970 +0000
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   347
summary:     b1.1
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   348
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   349
diff --git a/b1 b/b1
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   350
--- a/b1
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   351
+++ b/b1
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   352
@@ -1,1 +1,2 @@
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   353
 b1
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   354
+postm
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7404
diff changeset
   355
3718
7db88b094b14 fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3383
diff changeset
   356
% log -r ""
11405
bf5d88c466e0 revrange: attempt to parse old-style queries as a first pass
Matt Mackall <mpm@selenic.com>
parents: 11173
diff changeset
   357
hg: parse error: empty query
7062
efc579fdaf69 provide nicer feedback when an unknown node id is passed to a command
Sune Foldager <cryo@cyanite.org>
parents: 6736
diff changeset
   358
% log -r <some unknown node id>
efc579fdaf69 provide nicer feedback when an unknown node id is passed to a command
Sune Foldager <cryo@cyanite.org>
parents: 6736
diff changeset
   359
abort: unknown revision '1000000000000000000000000000000000000000'!
9373
b34184c046ac log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8020
diff changeset
   360
% log -k r1
b34184c046ac log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8020
diff changeset
   361
changeset:   1:3d5bf5654eda
b34184c046ac log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8020
diff changeset
   362
user:        test
b34184c046ac log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8020
diff changeset
   363
date:        Thu Jan 01 00:00:01 1970 +0000
b34184c046ac log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8020
diff changeset
   364
summary:     r1
b34184c046ac log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8020
diff changeset
   365
9421
c8e4dc218aaf log: prevent negative date range from displaying entire log (issue1805)
Christian Ebert <blacktrash@gmx.net>
parents: 9373
diff changeset
   366
% log -d -1
10826
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   367
% log -p -l2 --color=always
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   368
changeset:   6:2404bbcab562
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   369
tag:         tip
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   370
user:        test
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   371
date:        Thu Jan 01 00:00:01 1970 +0000
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   372
summary:     b1.1
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   373
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   374
diff -r 302e9dd6890d -r 2404bbcab562 b1
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   375
--- a/b1	Thu Jan 01 00:00:01 1970 +0000
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   376
+++ b/b1	Thu Jan 01 00:00:01 1970 +0000
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   377
@@ -1,1 +1,2 @@
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   378
 b1
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   379
+postm
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   380
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   381
changeset:   5:302e9dd6890d
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   382
parent:      3:e62f78d544b4
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   383
parent:      4:ddb82e70d1a1
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   384
user:        test
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   385
date:        Thu Jan 01 00:00:01 1970 +0000
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   386
summary:     m12
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   387
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   388
diff -r e62f78d544b4 -r 302e9dd6890d b2
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   389
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   390
+++ b/b2	Thu Jan 01 00:00:01 1970 +0000
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   391
@@ -0,0 +1,1 @@
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   392
+b2
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
   393
11061
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
   394
% log -r tip --stat
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
   395
changeset:   6:2404bbcab562
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
   396
tag:         tip
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
   397
user:        test
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
   398
date:        Thu Jan 01 00:00:01 1970 +0000
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
   399
summary:     b1.1
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
   400
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
   401
 b1 |  1 +
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
   402
 1 files changed, 1 insertions(+), 0 deletions(-)
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
   403
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   404
adding a
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   405
adding b
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   406
changeset:   0:29a4c94f1924
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   407
user:        User One <user1@example.org>
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   408
date:        Thu Jan 01 00:00:00 1970 +0000
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   409
summary:     a
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   410
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   411
changeset:   1:e834b5e69c0e
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   412
tag:         tip
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   413
user:        User Two <user2@example.org>
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   414
date:        Thu Jan 01 00:00:00 1970 +0000
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   415
summary:     b
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   416
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   417
changeset:   0:29a4c94f1924
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   418
user:        User One <user1@example.org>
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   419
date:        Thu Jan 01 00:00:00 1970 +0000
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   420
summary:     a
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
   421
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   422
adding a
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   423
marked working directory as branch test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   424
adding b
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   425
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   426
adding c
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   427
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   428
adding c
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   429
% log -b default
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   430
changeset:   2:c3a4f03cc9a7
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   431
parent:      0:24427303d56f
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   432
user:        test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   433
date:        Thu Jan 01 00:00:00 1970 +0000
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   434
summary:     commit on default
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   435
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   436
changeset:   0:24427303d56f
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   437
user:        test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   438
date:        Thu Jan 01 00:00:00 1970 +0000
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   439
summary:     commit on default
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   440
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   441
% log -b test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   442
changeset:   3:f5d8de11c2e2
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   443
branch:      test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   444
tag:         tip
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   445
parent:      1:d32277701ccb
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   446
user:        test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   447
date:        Thu Jan 01 00:00:00 1970 +0000
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   448
summary:     commit on test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   449
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   450
changeset:   1:d32277701ccb
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   451
branch:      test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   452
user:        test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   453
date:        Thu Jan 01 00:00:00 1970 +0000
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   454
summary:     commit on test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   455
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   456
% log -b dummy
10960
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   457
abort: unknown revision 'dummy'!
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   458
% log -b .
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   459
changeset:   3:f5d8de11c2e2
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   460
branch:      test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   461
tag:         tip
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   462
parent:      1:d32277701ccb
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   463
user:        test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   464
date:        Thu Jan 01 00:00:00 1970 +0000
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   465
summary:     commit on test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   466
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   467
changeset:   1:d32277701ccb
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   468
branch:      test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   469
user:        test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   470
date:        Thu Jan 01 00:00:00 1970 +0000
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   471
summary:     commit on test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   472
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   473
% log -b default -b test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   474
changeset:   3:f5d8de11c2e2
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   475
branch:      test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   476
tag:         tip
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   477
parent:      1:d32277701ccb
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   478
user:        test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   479
date:        Thu Jan 01 00:00:00 1970 +0000
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   480
summary:     commit on test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   481
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   482
changeset:   2:c3a4f03cc9a7
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   483
parent:      0:24427303d56f
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   484
user:        test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   485
date:        Thu Jan 01 00:00:00 1970 +0000
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   486
summary:     commit on default
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   487
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   488
changeset:   1:d32277701ccb
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   489
branch:      test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   490
user:        test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   491
date:        Thu Jan 01 00:00:00 1970 +0000
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   492
summary:     commit on test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   493
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   494
changeset:   0:24427303d56f
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   495
user:        test
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   496
date:        Thu Jan 01 00:00:00 1970 +0000
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   497
summary:     commit on default
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
   498
10960
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   499
% log -b default -b .
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   500
changeset:   3:f5d8de11c2e2
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   501
branch:      test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   502
tag:         tip
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   503
parent:      1:d32277701ccb
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   504
user:        test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   505
date:        Thu Jan 01 00:00:00 1970 +0000
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   506
summary:     commit on test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   507
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   508
changeset:   2:c3a4f03cc9a7
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   509
parent:      0:24427303d56f
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   510
user:        test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   511
date:        Thu Jan 01 00:00:00 1970 +0000
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   512
summary:     commit on default
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   513
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   514
changeset:   1:d32277701ccb
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   515
branch:      test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   516
user:        test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   517
date:        Thu Jan 01 00:00:00 1970 +0000
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   518
summary:     commit on test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   519
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   520
changeset:   0:24427303d56f
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   521
user:        test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   522
date:        Thu Jan 01 00:00:00 1970 +0000
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   523
summary:     commit on default
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   524
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   525
% log -b . -b test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   526
changeset:   3:f5d8de11c2e2
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   527
branch:      test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   528
tag:         tip
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   529
parent:      1:d32277701ccb
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   530
user:        test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   531
date:        Thu Jan 01 00:00:00 1970 +0000
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   532
summary:     commit on test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   533
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   534
changeset:   1:d32277701ccb
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   535
branch:      test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   536
user:        test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   537
date:        Thu Jan 01 00:00:00 1970 +0000
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   538
summary:     commit on test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   539
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   540
% log -b 2
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   541
changeset:   2:c3a4f03cc9a7
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   542
parent:      0:24427303d56f
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   543
user:        test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   544
date:        Thu Jan 01 00:00:00 1970 +0000
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   545
summary:     commit on default
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   546
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   547
changeset:   0:24427303d56f
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   548
user:        test
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   549
date:        Thu Jan 01 00:00:00 1970 +0000
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   550
summary:     commit on default
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
   551
11508
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   552
% log -p --cwd dir (in subdir)
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   553
changeset:   3:f5d8de11c2e2
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   554
branch:      test
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   555
tag:         tip
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   556
parent:      1:d32277701ccb
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   557
user:        test
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   558
date:        Thu Jan 01 00:00:00 1970 +0000
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   559
summary:     commit on test
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   560
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   561
diff -r d32277701ccb -r f5d8de11c2e2 c
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   562
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   563
+++ b/c	Thu Jan 01 00:00:00 1970 +0000
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   564
@@ -0,0 +1,1 @@
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   565
+c
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   566
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   567
changeset:   2:c3a4f03cc9a7
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   568
parent:      0:24427303d56f
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   569
user:        test
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   570
date:        Thu Jan 01 00:00:00 1970 +0000
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   571
summary:     commit on default
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   572
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   573
diff -r 24427303d56f -r c3a4f03cc9a7 c
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   574
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   575
+++ b/c	Thu Jan 01 00:00:00 1970 +0000
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   576
@@ -0,0 +1,1 @@
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   577
+c
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   578
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   579
changeset:   1:d32277701ccb
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   580
branch:      test
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   581
user:        test
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   582
date:        Thu Jan 01 00:00:00 1970 +0000
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   583
summary:     commit on test
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   584
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   585
diff -r 24427303d56f -r d32277701ccb b
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   586
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   587
+++ b/b	Thu Jan 01 00:00:00 1970 +0000
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   588
@@ -0,0 +1,1 @@
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   589
+b
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   590
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   591
changeset:   0:24427303d56f
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   592
user:        test
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   593
date:        Thu Jan 01 00:00:00 1970 +0000
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   594
summary:     commit on default
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   595
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   596
diff -r 000000000000 -r 24427303d56f a
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   597
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   598
+++ b/a	Thu Jan 01 00:00:00 1970 +0000
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   599
@@ -0,0 +1,1 @@
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   600
+a
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11405
diff changeset
   601
11509
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   602
% log -p -R repo
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   603
changeset:   0:24427303d56f
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   604
user:        test
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   605
date:        Thu Jan 01 00:00:00 1970 +0000
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   606
summary:     commit on default
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   607
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   608
diff -r 000000000000 -r 24427303d56f a
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   609
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   610
+++ b/a	Thu Jan 01 00:00:00 1970 +0000
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   611
@@ -0,0 +1,1 @@
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   612
+a
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
   613
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   614
adding init
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   615
adding foo
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   616
adding foo
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   617
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   618
adding branch
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   619
created new head
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   620
adding foo
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   621
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   622
created new head
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   623
merging foo
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   624
warning: conflicts during merge.
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   625
merging foo failed!
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   626
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   627
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   628
merging foo
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   629
warning: conflicts during merge.
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   630
merging foo failed!
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   631
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   632
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   633
@    changeset:   10:4dae8563d2c5
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   634
|\   tag:         tip
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   635
| |  parent:      9:7b35701b003e
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   636
| |  parent:      4:88176d361b69
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   637
| |  user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   638
| |  date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   639
| |  summary:     Last merge, related
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   640
| |
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   641
| o    changeset:   9:7b35701b003e
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   642
| |\   parent:      8:e5416ad8a855
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   643
| | |  parent:      7:87fe3144dcfa
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   644
| | |  user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   645
| | |  date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   646
| | |  summary:     First merge, related
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   647
| | |
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   648
| | o  changeset:   8:e5416ad8a855
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   649
| | |  parent:      6:dc6c325fe5ee
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   650
| | |  user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   651
| | |  date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   652
| | |  summary:     change foo in branch, related
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   653
| | |
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   654
| o |  changeset:   7:87fe3144dcfa
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   655
| |/   user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   656
| |    date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   657
| |    summary:     change foo, related
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   658
| |
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   659
| o  changeset:   6:dc6c325fe5ee
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   660
| |  user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   661
| |  date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   662
| |  summary:     create foo, related
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   663
| |
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   664
| o  changeset:   5:73db34516eb9
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   665
| |  parent:      0:e87515fd044a
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   666
| |  user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   667
| |  date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   668
| |  summary:     first branch, unrelated
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   669
| |
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   670
o |  changeset:   4:88176d361b69
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   671
| |  user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   672
| |  date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   673
| |  summary:     add foo, related
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   674
| |
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   675
o |  changeset:   3:dd78ae4afb56
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   676
| |  user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   677
| |  date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   678
| |  summary:     delete foo, unrelated
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   679
| |
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   680
o |  changeset:   2:c4c64aedf0f7
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   681
| |  user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   682
| |  date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   683
| |  summary:     add unrelated old foo
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   684
| |
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   685
o |  changeset:   1:e5faa7440653
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   686
|/   user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   687
|    date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   688
|    summary:     change, unrelated
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   689
|
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   690
o  changeset:   0:e87515fd044a
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   691
   user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   692
   date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   693
   summary:     init, unrelated
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   694
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   695
changeset:   10:4dae8563d2c5
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   696
tag:         tip
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   697
parent:      9:7b35701b003e
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   698
parent:      4:88176d361b69
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   699
user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   700
date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   701
summary:     Last merge, related
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   702
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   703
changeset:   9:7b35701b003e
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   704
parent:      8:e5416ad8a855
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   705
parent:      7:87fe3144dcfa
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   706
user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   707
date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   708
summary:     First merge, related
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   709
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   710
changeset:   8:e5416ad8a855
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   711
parent:      6:dc6c325fe5ee
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   712
user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   713
date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   714
summary:     change foo in branch, related
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   715
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   716
changeset:   7:87fe3144dcfa
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   717
user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   718
date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   719
summary:     change foo, related
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   720
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   721
changeset:   6:dc6c325fe5ee
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   722
user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   723
date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   724
summary:     create foo, related
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   725
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   726
changeset:   4:88176d361b69
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   727
user:        test
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   728
date:        Thu Jan 01 00:00:00 1970 +0000
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   729
summary:     add foo, related
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
   730