##// END OF EJS Templates
convert: properly pass null ids through .hgtags (issue4678)...
Matt Mackall -
r25305:884ef09c stable
parent child Browse files
Show More
@@ -128,6 +128,9 b' class mercurial_sink(converter_sink):'
128 continue
128 continue
129 revid = revmap.get(source.lookuprev(s[0]))
129 revid = revmap.get(source.lookuprev(s[0]))
130 if not revid:
130 if not revid:
131 if s[0] == hex(nullid):
132 revid = s[0]
133 else:
131 continue
134 continue
132 fp.write('%s %s\n' % (revid, s[1]))
135 fp.write('%s %s\n' % (revid, s[1]))
133 return fp.getvalue()
136 return fp.getvalue()
@@ -38,6 +38,13 b' Test that template can print all file co'
38 (branch merge, don't forget to commit)
38 (branch merge, don't forget to commit)
39 $ hg ci -m 'merge remote copy' -d '4 0'
39 $ hg ci -m 'merge remote copy' -d '4 0'
40 created new head
40 created new head
41
42 Make and delete some tags
43
44 $ hg tag that
45 $ hg tag --remove that
46 $ hg tag this
47
41 #if execbit
48 #if execbit
42 $ chmod +x baz
49 $ chmod +x baz
43 #else
50 #else
@@ -50,11 +57,14 b' Test that template can print all file co'
50 scanning source...
57 scanning source...
51 sorting...
58 sorting...
52 converting...
59 converting...
53 5 add foo bar
60 8 add foo bar
54 4 change foo
61 7 change foo
55 3 make bar and baz copies of foo
62 6 make bar and baz copies of foo
56 2 merge local copy
63 5 merge local copy
57 1 merge remote copy
64 4 merge remote copy
65 3 Added tag that for changeset 88586c4e9f02
66 2 Removed tag that
67 1 Added tag this for changeset c56a7f387039
58 0 mark baz executable
68 0 mark baz executable
59 updating bookmarks
69 updating bookmarks
60 $ cd new
70 $ cd new
@@ -66,12 +76,12 b' Test that template can print all file co'
66 #if execbit
76 #if execbit
67 $ hg bookmarks
77 $ hg bookmarks
68 premerge1 3:973ef48a98a4
78 premerge1 3:973ef48a98a4
69 premerge2 5:13d9b87cf8f8
79 premerge2 8:91d107c423ba
70 #else
80 #else
71 Different hash because no x bit
81 Different hash because no x bit
72 $ hg bookmarks
82 $ hg bookmarks
73 premerge1 3:973ef48a98a4
83 premerge1 3:973ef48a98a4
74 premerge2 5:df0779bcf33c
84 premerge2 8:3537b15eaaca
75 #endif
85 #endif
76 $ cd ..
86 $ cd ..
77
87
General Comments 0
You need to be logged in to leave comments. Login now