Mercurial > hg
comparison tests/test-log.out @ 2785:e7f70588af30
Test suite for log --follow and --follow-first.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Thu, 03 Aug 2006 15:12:15 -0700 |
| parents | ae5ce3454ef5 |
| children | 9826af4841ef |
comparison
equal
deleted
inserted
replaced
| 2784:12a7bfcafd8f | 2785:e7f70588af30 |
|---|---|
| 74 files: a | 74 files: a |
| 75 description: | 75 description: |
| 76 a | 76 a |
| 77 | 77 |
| 78 | 78 |
| 79 adding base | |
| 80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 81 adding b1 | |
| 82 % log -f | |
| 83 changeset: 3:e62f78d544b4 | |
| 84 tag: tip | |
| 85 parent: 1:3d5bf5654eda | |
| 86 user: test | |
| 87 date: Thu Jan 01 00:00:01 1970 +0000 | |
| 88 summary: b1 | |
| 89 | |
| 90 changeset: 1:3d5bf5654eda | |
| 91 user: test | |
| 92 date: Thu Jan 01 00:00:01 1970 +0000 | |
| 93 summary: r1 | |
| 94 | |
| 95 changeset: 0:67e992f2c4f3 | |
| 96 user: test | |
| 97 date: Thu Jan 01 00:00:01 1970 +0000 | |
| 98 summary: base | |
| 99 | |
| 100 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 101 adding b2 | |
| 102 % log -f -r 1:tip | |
| 103 changeset: 1:3d5bf5654eda | |
| 104 user: test | |
| 105 date: Thu Jan 01 00:00:01 1970 +0000 | |
| 106 summary: r1 | |
| 107 | |
| 108 changeset: 2:60c670bf5b30 | |
| 109 user: test | |
| 110 date: Thu Jan 01 00:00:01 1970 +0000 | |
| 111 summary: r2 | |
| 112 | |
| 113 changeset: 3:e62f78d544b4 | |
| 114 parent: 1:3d5bf5654eda | |
| 115 user: test | |
| 116 date: Thu Jan 01 00:00:01 1970 +0000 | |
| 117 summary: b1 | |
| 118 | |
| 119 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 121 (branch merge, don't forget to commit) | |
| 122 % log --follow-first | |
| 123 changeset: 6:2404bbcab562 | |
| 124 tag: tip | |
| 125 user: test | |
| 126 date: Thu Jan 01 00:00:01 1970 +0000 | |
| 127 summary: b1.1 | |
| 128 | |
| 129 changeset: 5:302e9dd6890d | |
| 130 parent: 3:e62f78d544b4 | |
| 131 parent: 4:ddb82e70d1a1 | |
| 132 user: test | |
| 133 date: Thu Jan 01 00:00:01 1970 +0000 | |
| 134 summary: m12 | |
| 135 | |
| 136 changeset: 3:e62f78d544b4 | |
| 137 parent: 1:3d5bf5654eda | |
| 138 user: test | |
| 139 date: Thu Jan 01 00:00:01 1970 +0000 | |
| 140 summary: b1 | |
| 141 | |
| 142 changeset: 1:3d5bf5654eda | |
| 143 user: test | |
| 144 date: Thu Jan 01 00:00:01 1970 +0000 | |
| 145 summary: r1 | |
| 146 | |
| 147 changeset: 0:67e992f2c4f3 | |
| 148 user: test | |
| 149 date: Thu Jan 01 00:00:01 1970 +0000 | |
| 150 summary: base | |
| 151 |