Mercurial > evolve

comparison tests/test-split.t @ 2576:bfc563aaac2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
effectflag: activate effect flag on test-split.t test file Prepare activation of effect flag by default by activating it on test-split.t test file first.
author Boris Feld <boris.feld@octobus.net>
date Sun, 04 Jun 2017 20:43:22 +0200
parents 9f42f819267b
children cbc7a69116bd
comparison
equal deleted inserted replaced
2575:9019d41998ab 2576:bfc563aaac2a
15 > [diff] 15 > [diff]
16 > git = 1 16 > git = 1
17 > unified = 0 17 > unified = 0
18 > [ui] 18 > [ui]
19 > interactive = true 19 > interactive = true
20 > [experimental]
21 > evolution.effect-flags = yes
20 > [extensions] 22 > [extensions]
21 > hgext.graphlog= 23 > hgext.graphlog=
22 > EOF 24 > EOF
23 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH 25 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
24 $ mkcommit() { 26 $ mkcommit() {
36 $ mkcommit _c 38 $ mkcommit _c
37 $ mkcommit _d 39 $ mkcommit _d
38 $ echo "change to a" >> _a 40 $ echo "change to a" >> _a
39 $ hg amend 41 $ hg amend
40 $ hg debugobsolete 42 $ hg debugobsolete
41 9e84a109b8eb081ad754681ee4b1380d17a3741f aa8f656bb307022172d2648be6fb65322f801225 0 (*) {'user': 'test'} (glob) 43 9e84a109b8eb081ad754681ee4b1380d17a3741f aa8f656bb307022172d2648be6fb65322f801225 0 (*) {'ef1': '*', 'user': 'test'} (glob)
42 f002b57772d7f09b180c407213ae16d92996a988 0 {9e84a109b8eb081ad754681ee4b1380d17a3741f} (*) {'user': 'test'} (glob) 44 f002b57772d7f09b180c407213ae16d92996a988 0 {9e84a109b8eb081ad754681ee4b1380d17a3741f} (*) {'ef1': '*', 'user': 'test'} (glob)
43 45
44 To create commits with the number of split 46 To create commits with the number of split
45 $ echo 0 > num 47 $ echo 0 > num
46 $ cat > editor.sh << '__EOF__' 48 $ cat > editor.sh << '__EOF__'
47 > NUM=$(cat num) 49 > NUM=$(cat num)
89 record this change to '_d'? [Ynesfdaq?] y 91 record this change to '_d'? [Ynesfdaq?] y
90 92
91 no more change to split 93 no more change to split
92 94
93 $ hg debugobsolete 95 $ hg debugobsolete
94 9e84a109b8eb081ad754681ee4b1380d17a3741f aa8f656bb307022172d2648be6fb65322f801225 0 (*) {'user': 'test'} (glob) 96 9e84a109b8eb081ad754681ee4b1380d17a3741f aa8f656bb307022172d2648be6fb65322f801225 0 (*) {'ef1': '*', 'user': 'test'} (glob)
95 f002b57772d7f09b180c407213ae16d92996a988 0 {9e84a109b8eb081ad754681ee4b1380d17a3741f} (*) {'user': 'test'} (glob) 97 f002b57772d7f09b180c407213ae16d92996a988 0 {9e84a109b8eb081ad754681ee4b1380d17a3741f} (*) {'ef1': '*', 'user': 'test'} (glob)
96 aa8f656bb307022172d2648be6fb65322f801225 a98b35e86cae589b61892127c5ec1c868e41d910 5410a2352fa3114883327beee89e3085eefac25c 0 (*) {'user': 'test'} (glob) 98 aa8f656bb307022172d2648be6fb65322f801225 a98b35e86cae589b61892127c5ec1c868e41d910 5410a2352fa3114883327beee89e3085eefac25c 0 (*) {'ef1': '*', 'user': 'test'} (glob)
97 $ hg glog 99 $ hg glog
98 @ changeset: 7:5410a2352fa3 100 @ changeset: 7:5410a2352fa3
99 | tag: tip 101 | tag: tip
100 | user: test 102 | user: test
101 | date: Thu Jan 01 00:00:00 1970 +0000 103 | date: Thu Jan 01 00:00:00 1970 +0000
125 127
126 Cannot split a commit with uncommitted changes 128 Cannot split a commit with uncommitted changes
127 $ hg up "desc(_c)" 129 $ hg up "desc(_c)"
128 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 130 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
129 $ echo "_cd" > _c 131 $ echo "_cd" > _c
130 $ hg split 132 $ hg split
131 abort: uncommitted changes 133 abort: uncommitted changes
132 [255] 134 [255]
133 135
134 Split a revision specified with -r 136 Split a revision specified with -r
135 $ hg up "desc(_c)" -C 137 $ hg up "desc(_c)" -C
196 198
197 Stop before splitting the commit completely creates a commit with all the 199 Stop before splitting the commit completely creates a commit with all the
198 remaining changes 200 remaining changes
199 201
200 $ hg debugobsolete 202 $ hg debugobsolete
201 9e84a109b8eb081ad754681ee4b1380d17a3741f aa8f656bb307022172d2648be6fb65322f801225 0 (*) {'user': 'test'} (glob) 203 9e84a109b8eb081ad754681ee4b1380d17a3741f aa8f656bb307022172d2648be6fb65322f801225 0 (*) {'ef1': '*', 'user': 'test'} (glob)
202 f002b57772d7f09b180c407213ae16d92996a988 0 {9e84a109b8eb081ad754681ee4b1380d17a3741f} (*) {'user': 'test'} (glob) 204 f002b57772d7f09b180c407213ae16d92996a988 0 {9e84a109b8eb081ad754681ee4b1380d17a3741f} (*) {'ef1': '*', 'user': 'test'} (glob)
203 aa8f656bb307022172d2648be6fb65322f801225 a98b35e86cae589b61892127c5ec1c868e41d910 5410a2352fa3114883327beee89e3085eefac25c 0 (*) {'user': 'test'} (glob) 205 aa8f656bb307022172d2648be6fb65322f801225 a98b35e86cae589b61892127c5ec1c868e41d910 5410a2352fa3114883327beee89e3085eefac25c 0 (*) {'ef1': '*', 'user': 'test'} (glob)
204 10200229058723ce8d67f6612c1f6b4f73b1fe73 719157b217acc43d397369a448824ed4c7a302f2 0 (*) {'user': 'test'} (glob) 206 10200229058723ce8d67f6612c1f6b4f73b1fe73 719157b217acc43d397369a448824ed4c7a302f2 0 (*) {'ef1': '*', 'user': 'test'} (glob)
205 5d0c8b0f2d3e5e1ff95f93d7da2ba06650605ab5 0 {10200229058723ce8d67f6612c1f6b4f73b1fe73} (*) {'user': 'test'} (glob) 207 5d0c8b0f2d3e5e1ff95f93d7da2ba06650605ab5 0 {10200229058723ce8d67f6612c1f6b4f73b1fe73} (*) {'ef1': '*', 'user': 'test'} (glob)
206 a98b35e86cae589b61892127c5ec1c868e41d910 286887947725085e03455d79649197feaef1eb9d 0 (*) {'user': 'test'} (glob) 208 a98b35e86cae589b61892127c5ec1c868e41d910 286887947725085e03455d79649197feaef1eb9d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
207 5410a2352fa3114883327beee89e3085eefac25c 0b67cee46a7f2ad664f994027e7af95b36ae25fe 0 (*) {'user': 'test'} (glob) 209 5410a2352fa3114883327beee89e3085eefac25c 0b67cee46a7f2ad664f994027e7af95b36ae25fe 0 (*) {'ef1': '*', 'user': 'test'} (glob)
208 719157b217acc43d397369a448824ed4c7a302f2 ced8fbcce3a7cd33f0e454d2cd63882ce1b6006b 73309fb98db840ba4ec5ad528346dc6ee0b39dcb 0 (*) {'user': 'test'} (glob) 210 719157b217acc43d397369a448824ed4c7a302f2 ced8fbcce3a7cd33f0e454d2cd63882ce1b6006b 73309fb98db840ba4ec5ad528346dc6ee0b39dcb 0 (*) {'ef1': '*', 'user': 'test'} (glob)
209 $ hg evolve --all 211 $ hg evolve --all
210 move:[10] split1 212 move:[10] split1
211 atop:[13] split4 213 atop:[13] split4
212 move:[11] split2 214 move:[11] split2
213 atop:[14] split1 215 atop:[14] split1