Mercurial > evolve

comparison tests/test-split.t @ 4576:96ce1030d2fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add --update to hg evolve to reduce test changes for the next patch
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 14 Apr 2019 02:18:19 +0800
parents 90f94231db5d
children bcd52ce0916d
comparison
equal deleted inserted replaced
4575:903e8b983fac 4576:96ce1030d2fb
149 149
150 Split a revision specified with -r 150 Split a revision specified with -r
151 $ echo "change to b" >> _b 151 $ echo "change to b" >> _b
152 $ hg amend -m "_cprim" 152 $ hg amend -m "_cprim"
153 2 new orphan changesets 153 2 new orphan changesets
154 $ hg evolve --all 154 $ hg evolve --all --update
155 move:[5] split1 155 move:[5] split1
156 atop:[7] _cprim 156 atop:[7] _cprim
157 move:[6] split2 157 move:[6] split2
158 working directory is now at * (glob) 158 working directory is now at * (glob)
159 $ hg log -r "desc(_cprim)" -v -p 159 $ hg log -r "desc(_cprim)" -v -p
216 d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'split', 'user': 'test'} 216 d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'split', 'user': 'test'}
217 52149352b372d39b19127d5bd2d488b1b63f9f85 b434287e665ce757ee5463a965cb3d119ca9e893 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 217 52149352b372d39b19127d5bd2d488b1b63f9f85 b434287e665ce757ee5463a965cb3d119ca9e893 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
218 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 218 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
219 033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 219 033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
220 b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'split', 'user': 'test'} 220 b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'split', 'user': 'test'}
221 $ hg evolve --all 221 $ hg evolve --all --update
222 move:[8] split1 222 move:[8] split1
223 atop:[11] split4 223 atop:[11] split4
224 move:[9] split2 224 move:[9] split2
225 working directory is now at d74c6715e706 225 working directory is now at d74c6715e706
226 $ hg log -G 226 $ hg log -G