equal
deleted
inserted
replaced
40 sorting... |
40 sorting... |
41 converting... |
41 converting... |
42 1 Initial add: a, c, e |
42 1 Initial add: a, c, e |
43 0 rename a into b, create a, rename c into d |
43 0 rename a into b, create a, rename c into d |
44 $ glog -R source-hg |
44 $ glog -R source-hg |
45 o 1@source "rename a into b, create a, rename c into d" files: a b c d e f |
45 o 1@source "rename a into b, create a, rename c into d" files+: [b d f], files-: [c e], files: [a] |
46 | |
46 | |
47 o 0@source "Initial add: a, c, e" files: a c e |
47 o 0@source "Initial add: a, c, e" files+: [a c e], files-: [], files: [] |
48 |
48 |
49 |
49 |
50 manifest |
50 manifest |
51 |
51 |
52 $ hg manifest -R source-hg -r tip |
52 $ hg manifest -R source-hg -r tip |
62 scanning source... |
62 scanning source... |
63 sorting... |
63 sorting... |
64 converting... |
64 converting... |
65 0 Initial add: a, c, e |
65 0 Initial add: a, c, e |
66 $ glog -R source-1-hg |
66 $ glog -R source-1-hg |
67 o 0@source "Initial add: a, c, e" files: a c e |
67 o 0@source "Initial add: a, c, e" files+: [a c e], files-: [], files: [] |
68 |
68 |
69 |
69 |
70 test with filemap |
70 test with filemap |
71 |
71 |
72 $ cat > filemap <<EOF |
72 $ cat > filemap <<EOF |
145 3 Initial add |
145 3 Initial add |
146 2 Editing a |
146 2 Editing a |
147 1 Editing b |
147 1 Editing b |
148 0 Merged improve branch |
148 0 Merged improve branch |
149 $ glog -R source-hg |
149 $ glog -R source-hg |
150 o 3@source "Merged improve branch" files: |
150 o 3@source "Merged improve branch" files+: [], files-: [], files: [b] |
151 |\ |
151 |\ |
152 | o 2@source-improve "Editing b" files: b |
152 | o 2@source-improve "Editing b" files+: [], files-: [], files: [b] |
153 | | |
153 | | |
154 o | 1@source "Editing a" files: a |
154 o | 1@source "Editing a" files+: [], files-: [], files: [a] |
155 |/ |
155 |/ |
156 o 0@source "Initial add" files: a b |
156 o 0@source "Initial add" files+: [a b], files-: [], files: [] |
157 |
157 |
158 $ cd .. |
158 $ cd .. |
159 |
159 |
160 #if symlink execbit |
160 #if symlink execbit |
161 |
161 |
248 2 adda |
248 2 adda |
249 1 addb |
249 1 addb |
250 0 changea |
250 0 changea |
251 updating tags |
251 updating tags |
252 $ (cd repo-bzr; glog) |
252 $ (cd repo-bzr; glog) |
253 o 3@default "update tags" files: .hgtags |
253 o 3@default "update tags" files+: [.hgtags], files-: [], files: [] |
254 | |
254 | |
255 o 2@default "changea" files: a |
255 o 2@default "changea" files+: [], files-: [], files: [a] |
256 | |
256 | |
257 | o 1@branch "addb" files: b |
257 | o 1@branch "addb" files+: [b], files-: [], files: [] |
258 |/ |
258 |/ |
259 o 0@default "adda" files: a |
259 o 0@default "adda" files+: [a], files-: [], files: [] |
260 |
260 |
261 |
261 |
262 Test tags (converted identifiers are not stable because bzr ones are |
262 Test tags (converted identifiers are not stable because bzr ones are |
263 not and get incorporated in extra fields). |
263 not and get incorporated in extra fields). |
264 |
264 |