Mercurial > evolve

comparison tests/test-touch.t @ 2929:06844693bb21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update after removing of redundant amend commit Following e8a7c1a0565a, temporary amend commits has been removed impacting all revision numbers in tests including amend operations. Update tests case to use description or hashes when possible and update revisions number when not.
author Boris Feld <boris.feld@octobus.net>
date Fri, 15 Sep 2017 15:48:18 +0200
parents 4b934144ed11
children bd7e8be29542
comparison
equal deleted inserted replaced
2928:6275808e89ef 2929:06844693bb21
16 $ hg commit -m a 16 $ hg commit -m a
17 17
18 Basic usage 18 Basic usage
19 19
20 $ hg log -G 20 $ hg log -G
21 @ 0:e93df3427f45 a 21 @ 0:[0-9a-f]{12} a (re)
22 22
23 $ hg touch . 23 $ hg touch .
24 $ hg log -G 24 $ hg log -G
25 @ 1:[0-9a-f]{12} a (re) 25 @ 1:[0-9a-f]{12} a (re)
26 26
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 content-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 3 53 $ hg prune 3
54 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
55 working directory now at 000000000000
54 1 changesets pruned 56 1 changesets pruned
55 57
56 Duplicate 58 Duplicate
57 59
58 $ hg touch --duplicate . 60 $ hg touch --duplicate .
59 $ hg log -G 61 $ hg log -G
60 @ 5:[0-9a-f]{12} a (re) 62 @ 4:[0-9a-f]{12} (re)
61 63
62 o 4:[0-9a-f]{12} a (re) 64 o 2:[0-9a-f]{12} ab (re)
63 65
64 66
65 Multiple touch 67 Multiple touch
66 68
67 $ echo C > c 69 $ echo C > c
69 $ hg commit -m c 71 $ hg commit -m c
70 $ echo D > d 72 $ echo D > d
71 $ hg add d 73 $ hg add d
72 $ hg commit -m d 74 $ hg commit -m d
73 $ hg log -G 75 $ hg log -G
74 @ 7:[0-9a-f]{12} d (re) 76 @ 6:[0-9a-f]{12} d (re)
75 | 77 |
76 o 6:[0-9a-f]{12} c (re) 78 o 5:[0-9a-f]{12} c (re)
77 | 79 |
78 o 5:[0-9a-f]{12} a (re) 80 o 4:[0-9a-f]{12} (re)
79 81
80 o 4:[0-9a-f]{12} a (re) 82 o 2:[0-9a-f]{12} ab (re)
81 83
82 $ hg touch 6:7 84 $ hg touch .^:.
83 $ hg log -G 85 $ hg log -G
84 @ 9:[0-9a-f]{12} d (re) 86 @ 8:[0-9a-f]{12} d (re)
85 | 87 |
86 o 8:[0-9a-f]{12} c (re) 88 o 7:[0-9a-f]{12} c (re)
87 | 89 |
88 o 5:[0-9a-f]{12} a (re) 90 o 4:[0-9a-f]{12} (re)
89 91
90 o 4:[0-9a-f]{12} a (re) 92 o 2:[0-9a-f]{12} ab (re)
91 93
92 94
93 check move data kept after rebase on touch: 95 check move data kept after rebase on touch:
94 96
95 $ touch gna1 97 $ touch gna1
105 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
106 108
107 $ hg touch 109 $ hg touch
108 1 new orphan changesets 110 1 new orphan changesets
109 111
110 $ hg rebase -s 11 -d 12 112 $ hg log -G --hidden
111 rebasing 11:* "move" (glob) 113 @ 11:[0-9a-f]{12} gna1 (re)
114 |
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)
120 |
121 o 7:[0-9a-f]{12} c (re)
122 |
123 | x 6:[0-9a-f]{12} d (re)
124 | |
125 | x 5:[0-9a-f]{12} c (re)
126 |/
127 o 4:[0-9a-f]{12} (re)
128
129 x 3:[0-9a-f]{12} a (re)
130
131 o 2:[0-9a-f]{12} ab (re)
132
133 x 1:[0-9a-f]{12} a (re)
134
135 x 0:[0-9a-f]{12} a (re)
136
137
138 $ hg rebase -s 10 -d 11
139 rebasing 10:[0-9a-f]{12} "move" (re)
112 $ hg st -C --change=tip 140 $ hg st -C --change=tip
113 A gna2 141 A gna2
114 gna1 142 gna1
115 R gna1 143 R gna1
116 144
117 check that the --duplicate option does not create divergence 145 check that the --duplicate option does not create divergence
118 146
119 $ hg touch --duplicate 11 --hidden 147 $ hg touch --duplicate 10 --hidden
120 1 new orphan changesets 148 1 new orphan changesets
121 149
122 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
123 151
124 $ hg prune 14 152 $ hg prune 13
125 1 changesets pruned 153 1 changesets pruned
126 $ hg touch 14 --hidden 154 $ hg touch 13 --hidden
127 1 new orphan changesets 155 1 new orphan changesets