Mercurial > hg
annotate tests/test-glog.out @ 6336:4b0c9c674707
warn about new heads on commit (issue842)
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Fri, 21 Mar 2008 11:06:02 +0100 |
| parents | b75105de8573 |
| children | 0d4e068e9e52 |
| rev | line source |
|---|---|
| 4344 | 1 % init |
| 2 % empty repo | |
| 3 % building tree | |
|
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5942
diff
changeset
|
4 created new head |
|
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5942
diff
changeset
|
5 created new head |
|
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5942
diff
changeset
|
6 created new head |
|
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5942
diff
changeset
|
7 created new head |
|
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5942
diff
changeset
|
8 created new head |
| 4344 | 9 % glog -q |
|
4583
11cf78983961
Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4511
diff
changeset
|
10 @ 34:0eed7cd895e0 |
| 4344 | 11 | |
| 12 | o 33:2e9d1b521374 | |
| 13 | | | |
| 14 o | 32:77f7d8438a3c | |
| 15 |\ \ | |
| 16 | o \ 31:82ee55204a79 | |
| 17 | |\ \ | |
| 18 | | o \ 30:777dfc428649 | |
| 19 | | |\ \ | |
| 20 | | | o | 29:f8e7fee63353 | |
| 21 | | | | | | |
| 22 | | o | | 28:4b6e9bd48cf9 | |
| 23 | | |\ \ \ | |
| 24 o | | | | | 27:e9e08174cd30 | |
| 25 |/ / / / / | |
| 26 | | o---+ 26:720dc079a855 | |
| 27 | | | | | | |
| 28 +---o | | 25:9d4ed048d013 | |
| 29 | | | | | | |
| 30 | | o | | 24:4a68967db00d | |
| 31 | | |\| | | |
| 32 | | o | | 23:bc31393cabdf | |
| 33 | |/| | | | |
| 34 +---o---+ 22:a37f2ea6ebc6 | |
| 35 | | / / | |
| 36 o | | | 21:e758e8f4ace9 | |
| 37 |\ \ \ \ | |
| 38 | o---+-+ 20:aeccadad74b4 | |
| 39 | / / / | |
| 40 o | | | 19:138069b5dad7 | |
| 41 |\ \ \ \ | |
| 42 +---+---o 18:5a8c9a29ef81 | |
| 43 | | | | | |
| 44 | o | | 17:43e52b935494 | |
| 45 | |\ \ \ | |
| 46 | | o---+ 16:449a2f9562a4 | |
| 47 | | |/ / | |
| 48 o | | | 15:c0b4283d4c1d | |
| 49 |\ \ \ \ | |
| 50 | o-----+ 14:9d533950abf0 | |
| 51 | |/ / / | |
| 52 o | | | 13:c39d0a2b8165 | |
| 53 |\ \ \ \ | |
| 54 +---o | | 12:74dc7aea4494 | |
| 55 | | |/ / | |
| 56 | o | | 11:c3c395dd8b98 | |
| 57 | |\ \ \ | |
| 58 | | o---+ 10:8094c50149ef | |
| 59 | |/ / / | |
| 60 o | | | 9:79ab1812f961 | |
| 61 |\ \ \ \ | |
| 62 | o-----+ 8:d7aa38594334 | |
| 63 |/ / / / | |
| 64 o | | | 7:699392d1259e | |
| 65 |\ \ \ \ | |
| 66 +---o | | 6:0ca7c061cf45 | |
| 67 | |/ / / | |
| 68 | o | | 5:3589c3c477ab | |
| 69 | |\ \ \ | |
| 70 | | o | | 4:e2cad8233c77 | |
| 71 | |/|/ / | |
| 72 | o / / 3:02173ffbf857 | |
| 73 |/ / / | |
| 74 o / / 2:e8ea2256f9ec | |
| 75 |/ / | |
| 76 o / 1:3cae7826a707 | |
| 77 |/ | |
| 78 o 0:7aa22e58e8c1 | |
| 79 | |
| 80 % glog | |
|
4583
11cf78983961
Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4511
diff
changeset
|
81 @ changeset: 34:0eed7cd895e0 |
| 4344 | 82 | tag: tip |
| 83 | parent: 32:77f7d8438a3c | |
| 84 | user: test | |
| 85 | date: Thu Jan 01 00:00:34 1970 +0000 | |
| 86 | summary: (34) head | |
| 87 | | |
| 88 | o changeset: 33:2e9d1b521374 | |
| 89 | | parent: 18:5a8c9a29ef81 | |
| 90 | | user: test | |
| 91 | | date: Thu Jan 01 00:00:33 1970 +0000 | |
| 92 | | summary: (33) head | |
| 93 | | | |
| 94 o | changeset: 32:77f7d8438a3c | |
| 95 |\ \ parent: 27:e9e08174cd30 | |
| 96 | | | parent: 31:82ee55204a79 | |
| 97 | | | user: test | |
| 98 | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
| 99 | | | summary: (32) expand | |
| 100 | | | | |
| 101 | o | changeset: 31:82ee55204a79 | |
| 102 | |\ \ parent: 21:e758e8f4ace9 | |
| 103 | | | | parent: 30:777dfc428649 | |
| 104 | | | | user: test | |
| 105 | | | | date: Thu Jan 01 00:00:31 1970 +0000 | |
| 106 | | | | summary: (31) expand | |
| 107 | | | | | |
| 108 | | o | changeset: 30:777dfc428649 | |
| 109 | | |\ \ parent: 28:4b6e9bd48cf9 | |
| 110 | | | | | parent: 29:f8e7fee63353 | |
| 111 | | | | | user: test | |
| 112 | | | | | date: Thu Jan 01 00:00:30 1970 +0000 | |
| 113 | | | | | summary: (30) expand | |
| 114 | | | | | | |
| 115 | | | o | changeset: 29:f8e7fee63353 | |
| 116 | | | | | parent: 0:7aa22e58e8c1 | |
| 117 | | | | | user: test | |
| 118 | | | | | date: Thu Jan 01 00:00:29 1970 +0000 | |
| 119 | | | | | summary: (29) regular commit | |
| 120 | | | | | | |
| 121 | | o | | changeset: 28:4b6e9bd48cf9 | |
| 122 | | |\ \ \ parent: 1:3cae7826a707 | |
| 123 | | | | | | parent: 26:720dc079a855 | |
| 124 | | | | | | user: test | |
| 125 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | |
| 126 | | | | | | summary: (28) merge zero known | |
| 127 | | | | | | | |
| 128 o | | | | | changeset: 27:e9e08174cd30 | |
| 129 |/ / / / / parent: 21:e758e8f4ace9 | |
| 130 | | | | | user: test | |
| 131 | | | | | date: Thu Jan 01 00:00:27 1970 +0000 | |
| 132 | | | | | summary: (27) collapse | |
| 133 | | | | | | |
| 134 | | o---+ changeset: 26:720dc079a855 | |
| 135 | | | | | parent: 18:5a8c9a29ef81 | |
| 136 | | | | | parent: 25:9d4ed048d013 | |
| 137 | | | | | user: test | |
| 138 | | | | | date: Thu Jan 01 00:00:26 1970 +0000 | |
| 139 | | | | | summary: (26) merge one known; far right | |
| 140 | | | | | | |
| 141 +---o | | changeset: 25:9d4ed048d013 | |
| 142 | | | | | parent: 21:e758e8f4ace9 | |
| 143 | | | | | parent: 24:4a68967db00d | |
| 144 | | | | | user: test | |
| 145 | | | | | date: Thu Jan 01 00:00:25 1970 +0000 | |
| 146 | | | | | summary: (25) merge one known; far left | |
| 147 | | | | | | |
| 148 | | o | | changeset: 24:4a68967db00d | |
| 149 | | |\| | parent: 0:7aa22e58e8c1 | |
| 150 | | | | | parent: 23:bc31393cabdf | |
| 151 | | | | | user: test | |
| 152 | | | | | date: Thu Jan 01 00:00:24 1970 +0000 | |
| 153 | | | | | summary: (24) merge one known; immediate right | |
| 154 | | | | | | |
| 155 | | o | | changeset: 23:bc31393cabdf | |
| 156 | |/| | | parent: 1:3cae7826a707 | |
| 157 | | | | | parent: 22:a37f2ea6ebc6 | |
| 158 | | | | | user: test | |
| 159 | | | | | date: Thu Jan 01 00:00:23 1970 +0000 | |
| 160 | | | | | summary: (23) merge one known; immediate left | |
| 161 | | | | | | |
| 162 +---o---+ changeset: 22:a37f2ea6ebc6 | |
| 163 | | | | parent: 18:5a8c9a29ef81 | |
| 164 | | / / parent: 21:e758e8f4ace9 | |
| 165 | | | | user: test | |
| 166 | | | | date: Thu Jan 01 00:00:22 1970 +0000 | |
| 167 | | | | summary: (22) merge two known; one far left, one far right | |
| 168 | | | | | |
| 169 o | | | changeset: 21:e758e8f4ace9 | |
| 170 |\ \ \ \ parent: 19:138069b5dad7 | |
| 171 | | | | | parent: 20:aeccadad74b4 | |
| 172 | | | | | user: test | |
| 173 | | | | | date: Thu Jan 01 00:00:21 1970 +0000 | |
| 174 | | | | | summary: (21) expand | |
| 175 | | | | | | |
| 176 | o---+-+ changeset: 20:aeccadad74b4 | |
| 177 | | | | parent: 0:7aa22e58e8c1 | |
| 178 | / / / parent: 18:5a8c9a29ef81 | |
| 179 | | | | user: test | |
| 180 | | | | date: Thu Jan 01 00:00:20 1970 +0000 | |
| 181 | | | | summary: (20) merge two known; two far right | |
| 182 | | | | | |
| 183 o | | | changeset: 19:138069b5dad7 | |
| 184 |\ \ \ \ parent: 15:c0b4283d4c1d | |
| 185 | | | | | parent: 17:43e52b935494 | |
| 186 | | | | | user: test | |
| 187 | | | | | date: Thu Jan 01 00:00:19 1970 +0000 | |
| 188 | | | | | summary: (19) expand | |
| 189 | | | | | | |
| 190 +---+---o changeset: 18:5a8c9a29ef81 | |
| 191 | | | | parent: 1:3cae7826a707 | |
| 192 | | | | parent: 15:c0b4283d4c1d | |
| 193 | | | | user: test | |
| 194 | | | | date: Thu Jan 01 00:00:18 1970 +0000 | |
| 195 | | | | summary: (18) merge two known; two far left | |
| 196 | | | | | |
| 197 | o | | changeset: 17:43e52b935494 | |
| 198 | |\ \ \ parent: 12:74dc7aea4494 | |
| 199 | | | | | parent: 16:449a2f9562a4 | |
| 200 | | | | | user: test | |
| 201 | | | | | date: Thu Jan 01 00:00:17 1970 +0000 | |
| 202 | | | | | summary: (17) expand | |
| 203 | | | | | | |
| 204 | | o---+ changeset: 16:449a2f9562a4 | |
| 205 | | | | | parent: 0:7aa22e58e8c1 | |
| 206 | | |/ / parent: 1:3cae7826a707 | |
| 207 | | | | user: test | |
| 208 | | | | date: Thu Jan 01 00:00:16 1970 +0000 | |
| 209 | | | | summary: (16) merge two known; one immediate right, one near right | |
| 210 | | | | | |
| 211 o | | | changeset: 15:c0b4283d4c1d | |
| 212 |\ \ \ \ parent: 13:c39d0a2b8165 | |
| 213 | | | | | parent: 14:9d533950abf0 | |
| 214 | | | | | user: test | |
| 215 | | | | | date: Thu Jan 01 00:00:15 1970 +0000 | |
| 216 | | | | | summary: (15) expand | |
| 217 | | | | | | |
| 218 | o-----+ changeset: 14:9d533950abf0 | |
| 219 | | | | | parent: 0:7aa22e58e8c1 | |
| 220 | |/ / / parent: 12:74dc7aea4494 | |
| 221 | | | | user: test | |
| 222 | | | | date: Thu Jan 01 00:00:14 1970 +0000 | |
| 223 | | | | summary: (14) merge two known; one immediate right, one far right | |
| 224 | | | | | |
| 225 o | | | changeset: 13:c39d0a2b8165 | |
| 226 |\ \ \ \ parent: 9:79ab1812f961 | |
| 227 | | | | | parent: 11:c3c395dd8b98 | |
| 228 | | | | | user: test | |
| 229 | | | | | date: Thu Jan 01 00:00:13 1970 +0000 | |
| 230 | | | | | summary: (13) expand | |
| 231 | | | | | | |
| 232 +---o | | changeset: 12:74dc7aea4494 | |
| 233 | | |/ / parent: 1:3cae7826a707 | |
| 234 | | | | parent: 9:79ab1812f961 | |
| 235 | | | | user: test | |
| 236 | | | | date: Thu Jan 01 00:00:12 1970 +0000 | |
| 237 | | | | summary: (12) merge two known; one immediate right, one far left | |
| 238 | | | | | |
| 239 | o | | changeset: 11:c3c395dd8b98 | |
| 240 | |\ \ \ parent: 6:0ca7c061cf45 | |
| 241 | | | | | parent: 10:8094c50149ef | |
| 242 | | | | | user: test | |
| 243 | | | | | date: Thu Jan 01 00:00:11 1970 +0000 | |
| 244 | | | | | summary: (11) expand | |
| 245 | | | | | | |
| 246 | | o---+ changeset: 10:8094c50149ef | |
| 247 | | | | | parent: 0:7aa22e58e8c1 | |
| 248 | |/ / / parent: 6:0ca7c061cf45 | |
| 249 | | | | user: test | |
| 250 | | | | date: Thu Jan 01 00:00:10 1970 +0000 | |
| 251 | | | | summary: (10) merge two known; one immediate left, one near right | |
| 252 | | | | | |
| 253 o | | | changeset: 9:79ab1812f961 | |
| 254 |\ \ \ \ parent: 7:699392d1259e | |
| 255 | | | | | parent: 8:d7aa38594334 | |
| 256 | | | | | user: test | |
| 257 | | | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
| 258 | | | | | summary: (9) expand | |
| 259 | | | | | | |
| 260 | o-----+ changeset: 8:d7aa38594334 | |
| 261 | | | | | parent: 0:7aa22e58e8c1 | |
| 262 |/ / / / parent: 7:699392d1259e | |
| 263 | | | | user: test | |
| 264 | | | | date: Thu Jan 01 00:00:08 1970 +0000 | |
| 265 | | | | summary: (8) merge two known; one immediate left, one far right | |
| 266 | | | | | |
| 267 o | | | changeset: 7:699392d1259e | |
| 268 |\ \ \ \ parent: 2:e8ea2256f9ec | |
| 269 | | | | | parent: 5:3589c3c477ab | |
| 270 | | | | | user: test | |
| 271 | | | | | date: Thu Jan 01 00:00:07 1970 +0000 | |
| 272 | | | | | summary: (7) expand | |
| 273 | | | | | | |
| 274 +---o | | changeset: 6:0ca7c061cf45 | |
| 275 | |/ / / parent: 2:e8ea2256f9ec | |
| 276 | | | | parent: 5:3589c3c477ab | |
| 277 | | | | user: test | |
| 278 | | | | date: Thu Jan 01 00:00:06 1970 +0000 | |
| 279 | | | | summary: (6) merge two known; one immediate left, one far left | |
| 280 | | | | | |
| 281 | o | | changeset: 5:3589c3c477ab | |
| 282 | |\ \ \ parent: 3:02173ffbf857 | |
| 283 | | | | | parent: 4:e2cad8233c77 | |
| 284 | | | | | user: test | |
| 285 | | | | | date: Thu Jan 01 00:00:05 1970 +0000 | |
| 286 | | | | | summary: (5) expand | |
| 287 | | | | | | |
| 288 | | o | | changeset: 4:e2cad8233c77 | |
| 289 | |/|/ / parent: 1:3cae7826a707 | |
| 290 | | | | parent: 3:02173ffbf857 | |
| 291 | | | | user: test | |
| 292 | | | | date: Thu Jan 01 00:00:04 1970 +0000 | |
| 293 | | | | summary: (4) merge two known; one immediate left, one immediate right | |
| 294 | | | | | |
| 295 | o | | changeset: 3:02173ffbf857 | |
| 296 |/ / / user: test | |
| 297 | | | date: Thu Jan 01 00:00:03 1970 +0000 | |
| 298 | | | summary: (3) collapse | |
| 299 | | | | |
| 300 o | | changeset: 2:e8ea2256f9ec | |
| 301 |/ / user: test | |
| 302 | | date: Thu Jan 01 00:00:02 1970 +0000 | |
| 303 | | summary: (2) collapse | |
| 304 | | | |
| 305 o | changeset: 1:3cae7826a707 | |
| 306 |/ user: test | |
| 307 | date: Thu Jan 01 00:00:01 1970 +0000 | |
| 308 | summary: (1) collapse | |
| 309 | | |
| 310 o changeset: 0:7aa22e58e8c1 | |
| 311 user: test | |
| 312 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 313 summary: (0) root | |
| 314 | |
|
5939
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
315 % file glog |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
316 o changeset: 5:3589c3c477ab |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
317 parent: 3:02173ffbf857 |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
318 parent: 4:e2cad8233c77 |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
319 user: test |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
320 date: Thu Jan 01 00:00:05 1970 +0000 |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
321 summary: (5) expand |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
322 |
|
4735
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
323 % unused arguments |
|
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
324 hg glog: invalid arguments |
|
5942
b75105de8573
glog shows at most one file: correct synopsis
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5941
diff
changeset
|
325 hg glog [OPTION]... [FILE] |
|
4735
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
326 |
|
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
327 show revision history alongside an ASCII revision graph |
|
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
328 failed |