Mercurial > evolve

comparison tests/test-touch.t @ 3013:945a0989e41b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
packaging: merge stable back into default 6.7.0 has been released.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 16:26:30 +0200
parents bd7e8be29542
children f5d472b7e800 df8d535216af
comparison
equal deleted inserted replaced
3012:081070828703 3013:945a0989e41b
34 $ hg up --hidden 1 34 $ hg up --hidden 1
35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 35 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
36 working directory parent is obsolete! (*) (glob) 36 working directory parent is obsolete! (*) (glob)
37 (use 'hg evolve' to update to its successor: *) (glob) 37 (use 'hg evolve' to update to its successor: *) (glob)
38 $ hg log -G 38 $ hg log -G
39 o 3:[0-9a-f]{12} ab (re) 39 o 2:[0-9a-f]{12} ab (re)
40 40
41 @ 1:[0-9a-f]{12} a (re) 41 @ 1:[0-9a-f]{12} a (re)
42 42
43 $ hg touch . 43 $ hg touch .
44 [1] a 44 [1] a
45 reviving this changeset will create divergence unless you make a duplicate. 45 reviving this changeset will create divergence unless you make a duplicate.
46 (a)llow divergence or (d)uplicate the changeset? a 46 (a)llow divergence or (d)uplicate the changeset? a
47 2 new divergent changesets 47 2 new content-divergent changesets
48 $ hg log -G 48 $ hg log -G
49 @ 4:[0-9a-f]{12} a (re) 49 @ 3:[0-9a-f]{12} a (re)
50 50
51 o 3:[0-9a-f]{12} ab (re) 51 o 2:[0-9a-f]{12} ab (re)
52 52
53 $ hg prune 4 53 $ hg prune 3
54 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 54 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
55 working directory now at 000000000000 55 working directory now at 000000000000
56 1 changesets pruned 56 1 changesets pruned
57 57
58 Duplicate 58 Duplicate
59 59
60 $ hg touch --duplicate . 60 $ hg touch --duplicate .
61 $ hg log -G 61 $ hg log -G
62 @ 5:[0-9a-f]{12} (re) 62 @ 4:[0-9a-f]{12} (re)
63 63
64 o 3:[0-9a-f]{12} ab (re) 64 o 2:[0-9a-f]{12} ab (re)
65 65
66 66
67 Multiple touch 67 Multiple touch
68 68
69 $ echo C > c 69 $ echo C > c
71 $ hg commit -m c 71 $ hg commit -m c
72 $ echo D > d 72 $ echo D > d
73 $ hg add d 73 $ hg add d
74 $ hg commit -m d 74 $ hg commit -m d
75 $ hg log -G 75 $ hg log -G
76 @ 7:[0-9a-f]{12} d (re) 76 @ 6:[0-9a-f]{12} d (re)
77 | 77 |
78 o 6:[0-9a-f]{12} c (re) 78 o 5:[0-9a-f]{12} c (re)
79 | 79 |
80 o 5:[0-9a-f]{12} (re) 80 o 4:[0-9a-f]{12} (re)
81 81
82 o 3:[0-9a-f]{12} ab (re) 82 o 2:[0-9a-f]{12} ab (re)
83 83
84 $ hg touch .^:. 84 $ hg touch .^:.
85 $ hg log -G 85 $ hg log -G
86 @ 9:[0-9a-f]{12} d (re) 86 @ 8:[0-9a-f]{12} d (re)
87 | 87 |
88 o 8:[0-9a-f]{12} c (re) 88 o 7:[0-9a-f]{12} c (re)
89 | 89 |
90 o 5:[0-9a-f]{12} (re) 90 o 4:[0-9a-f]{12} (re)
91 91
92 o 3:[0-9a-f]{12} ab (re) 92 o 2:[0-9a-f]{12} ab (re)
93 93
94 94
95 check move data kept after rebase on touch: 95 check move data kept after rebase on touch:
96 96
97 $ touch gna1 97 $ touch gna1
105 R gna1 105 R gna1
106 $ hg up .^ 106 $ hg up .^
107 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 107 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
108 108
109 $ hg touch 109 $ hg touch
110 1 new unstable changesets 110 1 new orphan changesets
111 111
112 $ hg log -G --hidden 112 $ hg log -G --hidden
113 @ 11:[0-9a-f]{12} gna1 (re)
114 |
113 | o 10:[0-9a-f]{12} move (re) 115 | o 10:[0-9a-f]{12} move (re)
116 | |
117 | x 9:[0-9a-f]{12} gna1 (re)
118 |/
119 o 8:[0-9a-f]{12} d (re)
114 | 120 |
115 | x 9:[0-9a-f]{12} gna1 (re) 121 o 7:[0-9a-f]{12} c (re)
122 |
123 | x 6:[0-9a-f]{12} d (re)
116 | | 124 | |
117 | x 6:[0-9a-f]{12} d (re) 125 | x 5:[0-9a-f]{12} c (re)
118 |/ 126 |/
119 | x 5:[0-9a-f]{12} c (re) 127 o 4:[0-9a-f]{12} (re)
120 |
121 o 8:[0-9a-f]{12} c (re)
122 |
123 | x 7:[0-9a-f]{12} d (re)
124 | |
125 | x 6:[0-9a-f]{12} c (re)
126 |/
127 o 5:[0-9a-f]{12} (re)
128 128
129 x 4:[0-9a-f]{12} a (re) 129 x 3:[0-9a-f]{12} a (re)
130 130
131 o 3:[0-9a-f]{12} ab (re) 131 o 2:[0-9a-f]{12} ab (re)
132 132
133 x 2:[0-9a-f]{12} temporary amend commit for [0-9a-f]{12} (re)
134 |
135 x 1:[0-9a-f]{12} a (re) 133 x 1:[0-9a-f]{12} a (re)
136 134
137 x 0:[0-9a-f]{12} a (re) 135 x 0:[0-9a-f]{12} a (re)
138 136
139 137
140 $ hg rebase -s 11 -d 12 138 $ hg rebase -s 10 -d 11
141 rebasing 11:[0-9a-f]{12} "move" (re) 139 rebasing 10:[0-9a-f]{12} "move" (re)
142 $ hg st -C --change=tip 140 $ hg st -C --change=tip
143 A gna2 141 A gna2
144 gna1 142 gna1
145 R gna1 143 R gna1
146 144
147 check that the --duplicate option does not create divergence 145 check that the --duplicate option does not create divergence
148 146
149 $ hg touch --duplicate 11 --hidden 147 $ hg touch --duplicate 10 --hidden
150 1 new unstable changesets 148 1 new orphan changesets
151 149
152 check that reviving a changeset with no successor does not show the prompt 150 check that reviving a changeset with no successor does not show the prompt
153 151
154 $ hg prune 14 152 $ hg prune 13
155 1 changesets pruned 153 1 changesets pruned
156 $ hg touch 14 --hidden 154 $ hg touch 13 --hidden
157 1 new unstable changesets 155 1 new orphan changesets