2099 1 files changed, 1 insertions(+), 0 deletions(-) |
2099 1 files changed, 1 insertions(+), 0 deletions(-) |
2100 |
2100 |
2101 |
2101 |
2102 $ hg up -q 6 |
2102 $ hg up -q 6 |
2103 $ hg log -G --git --patch --follow-first e |
2103 $ hg log -G --git --patch --follow-first e |
2104 \xe2\x97\x8d changeset: 6:fc281d8ff18d (esc) |
2104 \xe2\x97\x8d changeset: 6:9feeac35a70a (esc) |
2105 \xe2\x94\x82\xe2\x95\xb2 tag: tip (esc) |
2105 \xe2\x94\x82\xe2\x95\xb2 tag: tip (esc) |
2106 \xe2\x94\x82 \xe2\x95\xa7 parent: 5:99b31f1c2782 (esc) |
2106 \xe2\x94\x82 \xe2\x95\xa7 parent: 5:99b31f1c2782 (esc) |
2107 \xe2\x94\x82 parent: 4:17d952250a9d (esc) |
2107 \xe2\x94\x82 parent: 4:17d952250a9d (esc) |
2108 \xe2\x94\x82 user: test (esc) |
2108 \xe2\x94\x82 user: test (esc) |
2109 \xe2\x94\x82 date: Thu Jan 01 00:00:00 1970 +0000 (esc) |
2109 \xe2\x94\x82 date: Thu Jan 01 00:00:00 1970 +0000 (esc) |
2146 created new head |
2146 created new head |
2147 $ hg up -q 2 |
2147 $ hg up -q 2 |
2148 $ hg log -G --template "{rev} {desc|firstline}\n" |
2148 $ hg log -G --template "{rev} {desc|firstline}\n" |
2149 \xe2\x97\x8b 8 add g (esc) |
2149 \xe2\x97\x8b 8 add g (esc) |
2150 \xe2\x94\x82 (esc) |
2150 \xe2\x94\x82 (esc) |
2151 \xe2\x94\x82 \xe2\x97\x8b 7 Added tag foo-bar for changeset fc281d8ff18d (esc) |
2151 \xe2\x94\x82 \xe2\x97\x8b 7 Added tag foo-bar for changeset 9feeac35a70a (esc) |
2152 \xe2\x94\x82\xe2\x95\xb1 (esc) |
2152 \xe2\x94\x82\xe2\x95\xb1 (esc) |
2153 \xe2\x97\x8b 6 merge 5 and 4 (esc) |
2153 \xe2\x97\x8b 6 merge 5 and 4 (esc) |
2154 \xe2\x94\x82\xe2\x95\xb2 (esc) |
2154 \xe2\x94\x82\xe2\x95\xb2 (esc) |
2155 \xe2\x94\x82 \xe2\x97\x8b 5 add another e (esc) |
2155 \xe2\x94\x82 \xe2\x97\x8b 5 add another e (esc) |
2156 \xe2\x94\x82 \xe2\x94\x82 (esc) |
2156 \xe2\x94\x82 \xe2\x94\x82 (esc) |
2309 +ee |
2309 +ee |
2310 # HG changeset patch |
2310 # HG changeset patch |
2311 # User test |
2311 # User test |
2312 # Date 0 0 |
2312 # Date 0 0 |
2313 # Thu Jan 01 00:00:00 1970 +0000 |
2313 # Thu Jan 01 00:00:00 1970 +0000 |
2314 # Node ID fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
2314 # Node ID 9feeac35a70aa325519bbf3178683271113f2b8f |
2315 # Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b |
2315 # Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b |
2316 # Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260 |
2316 # Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260 |
2317 merge 5 and 4 |
2317 merge 5 and 4 |
2318 |
2318 |
2319 diff -r 99b31f1c2782 -r fc281d8ff18d dir/b |
2319 diff -r 99b31f1c2782 -r 9feeac35a70a dir/b |
2320 --- a/dir/b Thu Jan 01 00:00:00 1970 +0000 |
2320 --- a/dir/b Thu Jan 01 00:00:00 1970 +0000 |
2321 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2321 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2322 @@ -1,1 +0,0 @@ |
2322 @@ -1,1 +0,0 @@ |
2323 -a |
2323 -a |
2324 diff -r 99b31f1c2782 -r fc281d8ff18d e |
2324 diff -r 99b31f1c2782 -r 9feeac35a70a e |
2325 --- a/e Thu Jan 01 00:00:00 1970 +0000 |
2325 --- a/e Thu Jan 01 00:00:00 1970 +0000 |
2326 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
2326 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
2327 @@ -1,1 +1,1 @@ |
2327 @@ -1,1 +1,1 @@ |
2328 -ee |
2328 -ee |
2329 +merge |
2329 +merge |
2330 # HG changeset patch |
2330 # HG changeset patch |
2331 # User test |
2331 # User test |
2332 # Date 0 0 |
2332 # Date 0 0 |
2333 # Thu Jan 01 00:00:00 1970 +0000 |
2333 # Thu Jan 01 00:00:00 1970 +0000 |
2334 # Node ID 02dbb8e276b8ab7abfd07cab50c901647e75c2dd |
2334 # Node ID 9febbb9c8b2e09670a2fb550cb1e4e01a2c7e9fd |
2335 # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
2335 # Parent 9feeac35a70aa325519bbf3178683271113f2b8f |
2336 Added tag foo-bar for changeset fc281d8ff18d |
2336 Added tag foo-bar for changeset 9feeac35a70a |
2337 |
2337 |
2338 diff -r fc281d8ff18d -r 02dbb8e276b8 .hgtags |
2338 diff -r 9feeac35a70a -r 9febbb9c8b2e .hgtags |
2339 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2339 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2340 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
2340 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
2341 @@ -0,0 +1,1 @@ |
2341 @@ -0,0 +1,1 @@ |
2342 +fc281d8ff18d999ad6497b3d27390bcd695dcc73 foo-bar |
2342 +9feeac35a70aa325519bbf3178683271113f2b8f foo-bar |
2343 # HG changeset patch |
2343 # HG changeset patch |
2344 # User test |
2344 # User test |
2345 # Date 0 0 |
2345 # Date 0 0 |
2346 # Thu Jan 01 00:00:00 1970 +0000 |
2346 # Thu Jan 01 00:00:00 1970 +0000 |
2347 # Node ID 24c2e826ddebf80f9dcd60b856bdb8e6715c5449 |
2347 # Node ID 3bd4551ec3fe1c0696241f236abe857a53c6d6e7 |
2348 # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
2348 # Parent 9feeac35a70aa325519bbf3178683271113f2b8f |
2349 add g |
2349 add g |
2350 |
2350 |
2351 diff -r fc281d8ff18d -r 24c2e826ddeb g |
2351 diff -r 9feeac35a70a -r 3bd4551ec3fe g |
2352 --- a/g Thu Jan 01 00:00:00 1970 +0000 |
2352 --- a/g Thu Jan 01 00:00:00 1970 +0000 |
2353 +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
2353 +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
2354 @@ -1,2 +1,1 @@ |
2354 @@ -1,2 +1,1 @@ |
2355 -f |
2355 -f |
2356 -f |
2356 -f |
2434 $ testlog --hidden |
2434 $ testlog --hidden |
2435 [] |
2435 [] |
2436 [] |
2436 [] |
2437 <spanset- 0:9> |
2437 <spanset- 0:9> |
2438 $ hg log -G --template '{rev} {desc}\n' |
2438 $ hg log -G --template '{rev} {desc}\n' |
2439 \xe2\x97\x8b 7 Added tag foo-bar for changeset fc281d8ff18d (esc) |
2439 \xe2\x97\x8b 7 Added tag foo-bar for changeset 9feeac35a70a (esc) |
2440 \xe2\x94\x82 (esc) |
2440 \xe2\x94\x82 (esc) |
2441 \xe2\x97\x8b 6 merge 5 and 4 (esc) |
2441 \xe2\x97\x8b 6 merge 5 and 4 (esc) |
2442 \xe2\x94\x82\xe2\x95\xb2 (esc) |
2442 \xe2\x94\x82\xe2\x95\xb2 (esc) |
2443 \xe2\x94\x82 \xe2\x97\x8b 5 add another e (esc) |
2443 \xe2\x94\x82 \xe2\x97\x8b 5 add another e (esc) |
2444 \xe2\x94\x82 \xe2\x94\x82 (esc) |
2444 \xe2\x94\x82 \xe2\x94\x82 (esc) |