Mercurial > evolve

comparison tests/test-evolve-noupdate.t @ 3936:537fd9a86c06 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:22:50 +0200
parents d00f0c369bc7
children e07e764c0f48
comparison
equal deleted inserted replaced
3935:9af0e2b0bdd7 3936:537fd9a86c06
42 42
43 $ hg up .^^ 43 $ hg up .^^
44 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 44 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
45 $ echo bar > b 45 $ echo bar > b
46 $ hg amend 46 $ hg amend
47 2 new orphan changesets 47 2 new unstable changesets
48 $ hg glog 48 $ hg glog
49 @ 5:7ed0642d644b added b 49 @ 6:7ed0642d644b added b
50 | () draft 50 | () draft
51 | o 4:c41c793e0ef1 added d 51 | o 4:c41c793e0ef1 added d
52 | | () draft 52 | | () draft
53 | o 3:ca1b80f7960a added c 53 | o 3:ca1b80f7960a added c
54 | | () draft 54 | | () draft
60 () draft 60 () draft
61 61
62 There is 'working directory is now at' message because it didnt changed 62 There is 'working directory is now at' message because it didnt changed
63 $ hg evolve --all --no-update 63 $ hg evolve --all --no-update
64 move:[3] added c 64 move:[3] added c
65 atop:[5] added b 65 atop:[6] added b
66 move:[4] added d 66 move:[4] added d
67 atop:[6] added c 67 atop:[7] added c
68 68
69 $ hg glog 69 $ hg glog
70 o 7:b6b20b8eefdc added d 70 o 8:b6b20b8eefdc added d
71 | () draft 71 | () draft
72 o 6:7c46f743e62f added c 72 o 7:7c46f743e62f added c
73 | () draft 73 | () draft
74 @ 5:7ed0642d644b added b 74 @ 6:7ed0642d644b added b
75 | () draft 75 | () draft
76 o 1:c7586e2a9264 added a 76 o 1:c7586e2a9264 added a
77 | () draft 77 | () draft
78 o 0:8fa14d15e168 added hgignore 78 o 0:8fa14d15e168 added hgignore
79 () draft 79 () draft
84 $ hg prev 84 $ hg prev
85 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 85 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
86 [1] added a 86 [1] added a
87 $ echo bar > a 87 $ echo bar > a
88 $ hg amend 88 $ hg amend
89 3 new orphan changesets 89 3 new unstable changesets
90 $ hg up 7ed0642d644b 90 $ hg up 7ed0642d644b
91 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 91 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
92 92
93 $ hg glog 93 $ hg glog
94 o 8:3d41537b44ca added a 94 o 10:3d41537b44ca added a
95 | () draft 95 | () draft
96 | o 7:b6b20b8eefdc added d 96 | o 8:b6b20b8eefdc added d
97 | | () draft 97 | | () draft
98 | o 6:7c46f743e62f added c 98 | o 7:7c46f743e62f added c
99 | | () draft 99 | | () draft
100 | @ 5:7ed0642d644b added b 100 | @ 6:7ed0642d644b added b
101 | | () draft 101 | | () draft
102 | x 1:c7586e2a9264 added a 102 | x 1:c7586e2a9264 added a
103 |/ () draft 103 |/ () draft
104 o 0:8fa14d15e168 added hgignore 104 o 0:8fa14d15e168 added hgignore
105 () draft 105 () draft
106 106
107 $ hg evolve --all --any --no-update 107 $ hg evolve --all --any --no-update
108 move:[5] added b 108 move:[6] added b
109 atop:[8] added a 109 atop:[10] added a
110 move:[6] added c 110 move:[7] added c
111 atop:[9] added b 111 atop:[11] added b
112 move:[7] added d 112 move:[8] added d
113 atop:[10] added c 113 atop:[12] added c
114 working directory is now at 12c720cb3782 114 working directory is now at 12c720cb3782
115 115
116 $ hg glog 116 $ hg glog
117 o 11:a74d9f22ba3f added d 117 o 13:a74d9f22ba3f added d
118 | () draft 118 | () draft
119 o 10:958f5155e8cd added c 119 o 12:958f5155e8cd added c
120 | () draft 120 | () draft
121 @ 9:12c720cb3782 added b 121 @ 11:12c720cb3782 added b
122 | () draft 122 | () draft
123 o 8:3d41537b44ca added a 123 o 10:3d41537b44ca added a
124 | () draft 124 | () draft
125 o 0:8fa14d15e168 added hgignore 125 o 0:8fa14d15e168 added hgignore
126 () draft 126 () draft