1949 1 files changed, 1 insertions(+), 0 deletions(-) |
1949 1 files changed, 1 insertions(+), 0 deletions(-) |
1950 |
1950 |
1951 |
1951 |
1952 $ hg up -q 6 |
1952 $ hg up -q 6 |
1953 $ hg log -G --git --patch --follow-first e |
1953 $ hg log -G --git --patch --follow-first e |
1954 @ changeset: 6:fc281d8ff18d |
1954 @ changeset: 6:9feeac35a70a |
1955 |\ tag: tip |
1955 |\ tag: tip |
1956 | ~ parent: 5:99b31f1c2782 |
1956 | ~ parent: 5:99b31f1c2782 |
1957 | parent: 4:17d952250a9d |
1957 | parent: 4:17d952250a9d |
1958 | user: test |
1958 | user: test |
1959 | date: Thu Jan 01 00:00:00 1970 +0000 |
1959 | date: Thu Jan 01 00:00:00 1970 +0000 |
2159 +ee |
2159 +ee |
2160 # HG changeset patch |
2160 # HG changeset patch |
2161 # User test |
2161 # User test |
2162 # Date 0 0 |
2162 # Date 0 0 |
2163 # Thu Jan 01 00:00:00 1970 +0000 |
2163 # Thu Jan 01 00:00:00 1970 +0000 |
2164 # Node ID fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
2164 # Node ID 9feeac35a70aa325519bbf3178683271113f2b8f |
2165 # Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b |
2165 # Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b |
2166 # Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260 |
2166 # Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260 |
2167 merge 5 and 4 |
2167 merge 5 and 4 |
2168 |
2168 |
2169 diff -r 99b31f1c2782 -r fc281d8ff18d dir/b |
2169 diff -r 99b31f1c2782 -r 9feeac35a70a dir/b |
2170 --- a/dir/b Thu Jan 01 00:00:00 1970 +0000 |
2170 --- a/dir/b Thu Jan 01 00:00:00 1970 +0000 |
2171 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2171 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2172 @@ -1,1 +0,0 @@ |
2172 @@ -1,1 +0,0 @@ |
2173 -a |
2173 -a |
2174 diff -r 99b31f1c2782 -r fc281d8ff18d e |
2174 diff -r 99b31f1c2782 -r 9feeac35a70a e |
2175 --- a/e Thu Jan 01 00:00:00 1970 +0000 |
2175 --- a/e Thu Jan 01 00:00:00 1970 +0000 |
2176 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
2176 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
2177 @@ -1,1 +1,1 @@ |
2177 @@ -1,1 +1,1 @@ |
2178 -ee |
2178 -ee |
2179 +merge |
2179 +merge |
2180 # HG changeset patch |
2180 # HG changeset patch |
2181 # User test |
2181 # User test |
2182 # Date 0 0 |
2182 # Date 0 0 |
2183 # Thu Jan 01 00:00:00 1970 +0000 |
2183 # Thu Jan 01 00:00:00 1970 +0000 |
2184 # Node ID 02dbb8e276b8ab7abfd07cab50c901647e75c2dd |
2184 # Node ID 9febbb9c8b2e09670a2fb550cb1e4e01a2c7e9fd |
2185 # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
2185 # Parent 9feeac35a70aa325519bbf3178683271113f2b8f |
2186 Added tag foo-bar for changeset fc281d8ff18d |
2186 Added tag foo-bar for changeset 9feeac35a70a |
2187 |
2187 |
2188 diff -r fc281d8ff18d -r 02dbb8e276b8 .hgtags |
2188 diff -r 9feeac35a70a -r 9febbb9c8b2e .hgtags |
2189 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2189 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
2190 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
2190 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 |
2191 @@ -0,0 +1,1 @@ |
2191 @@ -0,0 +1,1 @@ |
2192 +fc281d8ff18d999ad6497b3d27390bcd695dcc73 foo-bar |
2192 +9feeac35a70aa325519bbf3178683271113f2b8f foo-bar |
2193 # HG changeset patch |
2193 # HG changeset patch |
2194 # User test |
2194 # User test |
2195 # Date 0 0 |
2195 # Date 0 0 |
2196 # Thu Jan 01 00:00:00 1970 +0000 |
2196 # Thu Jan 01 00:00:00 1970 +0000 |
2197 # Node ID 24c2e826ddebf80f9dcd60b856bdb8e6715c5449 |
2197 # Node ID 3bd4551ec3fe1c0696241f236abe857a53c6d6e7 |
2198 # Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 |
2198 # Parent 9feeac35a70aa325519bbf3178683271113f2b8f |
2199 add g |
2199 add g |
2200 |
2200 |
2201 diff -r fc281d8ff18d -r 24c2e826ddeb g |
2201 diff -r 9feeac35a70a -r 3bd4551ec3fe g |
2202 --- a/g Thu Jan 01 00:00:00 1970 +0000 |
2202 --- a/g Thu Jan 01 00:00:00 1970 +0000 |
2203 +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
2203 +++ b/g Thu Jan 01 00:00:00 1970 +0000 |
2204 @@ -1,2 +1,1 @@ |
2204 @@ -1,2 +1,1 @@ |
2205 -f |
2205 -f |
2206 -f |
2206 -f |