40 $ hg debugobsolete |
40 $ hg debugobsolete |
41 9e84a109b8eb081ad754681ee4b1380d17a3741f aa8f656bb307022172d2648be6fb65322f801225 0 (*) {'user': 'test'} (glob) |
41 9e84a109b8eb081ad754681ee4b1380d17a3741f aa8f656bb307022172d2648be6fb65322f801225 0 (*) {'user': 'test'} (glob) |
42 f002b57772d7f09b180c407213ae16d92996a988 0 {9e84a109b8eb081ad754681ee4b1380d17a3741f} (*) {'user': 'test'} (glob) |
42 f002b57772d7f09b180c407213ae16d92996a988 0 {9e84a109b8eb081ad754681ee4b1380d17a3741f} (*) {'user': 'test'} (glob) |
43 |
43 |
44 To create commits with the number of split |
44 To create commits with the number of split |
45 $ export NUM=0 |
45 $ echo 0 > num |
46 $ export HGEDITOR="NUM=$((NUM+1)); echo split$NUM > $1" |
46 $ cat > editor.sh << '__EOF__' |
|
47 > NUM=$(cat num) |
|
48 > NUM=`expr "$NUM" + 1` |
|
49 > echo "$NUM" > num |
|
50 > echo "split$NUM" > "$1" |
|
51 > __EOF__ |
|
52 $ export HGEDITOR="\"sh\" \"editor.sh\"" |
47 $ hg split << EOF |
53 $ hg split << EOF |
48 > y |
54 > y |
49 > y |
55 > y |
50 > y |
56 > y |
51 > n |
57 > n |
85 no more change to split |
91 no more change to split |
86 |
92 |
87 $ hg debugobsolete |
93 $ hg debugobsolete |
88 9e84a109b8eb081ad754681ee4b1380d17a3741f aa8f656bb307022172d2648be6fb65322f801225 0 (*) {'user': 'test'} (glob) |
94 9e84a109b8eb081ad754681ee4b1380d17a3741f aa8f656bb307022172d2648be6fb65322f801225 0 (*) {'user': 'test'} (glob) |
89 f002b57772d7f09b180c407213ae16d92996a988 0 {9e84a109b8eb081ad754681ee4b1380d17a3741f} (*) {'user': 'test'} (glob) |
95 f002b57772d7f09b180c407213ae16d92996a988 0 {9e84a109b8eb081ad754681ee4b1380d17a3741f} (*) {'user': 'test'} (glob) |
90 aa8f656bb307022172d2648be6fb65322f801225 8a76f55839e6badd47ed8338803d8bc16f578d68 1e105584671a463974ee2122f95979ce5e507f1a 0 (*) {'user': 'test'} (glob) |
96 aa8f656bb307022172d2648be6fb65322f801225 a98b35e86cae589b61892127c5ec1c868e41d910 5410a2352fa3114883327beee89e3085eefac25c 0 (*) {'user': 'test'} (glob) |
|
97 $ hg glog |
|
98 @ changeset: 7:5410a2352fa3 |
|
99 | tag: tip |
|
100 | user: test |
|
101 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
102 | summary: split2 |
|
103 | |
|
104 o changeset: 6:a98b35e86cae |
|
105 | parent: 2:102002290587 |
|
106 | user: test |
|
107 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
108 | summary: split1 |
|
109 | |
|
110 o changeset: 2:102002290587 |
|
111 | user: test |
|
112 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
113 | summary: add _c |
|
114 | |
|
115 o changeset: 1:37445b16603b |
|
116 | user: test |
|
117 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
118 | summary: add _b |
|
119 | |
|
120 o changeset: 0:135f39f4bd78 |
|
121 user: test |
|
122 date: Thu Jan 01 00:00:00 1970 +0000 |
|
123 summary: add _a |
|
124 |
91 |
125 |
92 Cannot split a commit with uncommited changes |
126 Cannot split a commit with uncommited changes |
93 $ hg up "desc(_c)" |
127 $ hg up "desc(_c)" |
94 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
128 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
95 $ echo "_cd" > _c |
129 $ echo "_cd" > _c |
102 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
136 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
103 $ echo "change to b" >> _b |
137 $ echo "change to b" >> _b |
104 $ hg amend -m "_cprim" |
138 $ hg amend -m "_cprim" |
105 2 new unstable changesets |
139 2 new unstable changesets |
106 $ hg evolve --all |
140 $ hg evolve --all |
107 move:[6] split0 |
141 move:[6] split1 |
108 atop:[9] _cprim |
142 atop:[9] _cprim |
109 move:[7] split0 |
143 move:[7] split2 |
110 atop:[10] split0 |
144 atop:[10] split1 |
111 working directory is now at * (glob) |
145 working directory is now at * (glob) |
112 $ hg log -r "desc(_cprim)" -v -p |
146 $ hg log -r "desc(_cprim)" -v -p |
113 changeset: 9:719157b217ac |
147 changeset: 9:719157b217ac |
114 parent: 1:37445b16603b |
148 parent: 1:37445b16603b |
115 user: test |
149 user: test |
165 remaining changes |
199 remaining changes |
166 |
200 |
167 $ hg debugobsolete |
201 $ hg debugobsolete |
168 9e84a109b8eb081ad754681ee4b1380d17a3741f aa8f656bb307022172d2648be6fb65322f801225 0 (*) {'user': 'test'} (glob) |
202 9e84a109b8eb081ad754681ee4b1380d17a3741f aa8f656bb307022172d2648be6fb65322f801225 0 (*) {'user': 'test'} (glob) |
169 f002b57772d7f09b180c407213ae16d92996a988 0 {9e84a109b8eb081ad754681ee4b1380d17a3741f} (*) {'user': 'test'} (glob) |
203 f002b57772d7f09b180c407213ae16d92996a988 0 {9e84a109b8eb081ad754681ee4b1380d17a3741f} (*) {'user': 'test'} (glob) |
170 aa8f656bb307022172d2648be6fb65322f801225 8a76f55839e6badd47ed8338803d8bc16f578d68 1e105584671a463974ee2122f95979ce5e507f1a 0 (*) {'user': 'test'} (glob) |
204 aa8f656bb307022172d2648be6fb65322f801225 a98b35e86cae589b61892127c5ec1c868e41d910 5410a2352fa3114883327beee89e3085eefac25c 0 (*) {'user': 'test'} (glob) |
171 10200229058723ce8d67f6612c1f6b4f73b1fe73 719157b217acc43d397369a448824ed4c7a302f2 0 (*) {'user': 'test'} (glob) |
205 10200229058723ce8d67f6612c1f6b4f73b1fe73 719157b217acc43d397369a448824ed4c7a302f2 0 (*) {'user': 'test'} (glob) |
172 5d0c8b0f2d3e5e1ff95f93d7da2ba06650605ab5 0 {10200229058723ce8d67f6612c1f6b4f73b1fe73} (*) {'user': 'test'} (glob) |
206 5d0c8b0f2d3e5e1ff95f93d7da2ba06650605ab5 0 {10200229058723ce8d67f6612c1f6b4f73b1fe73} (*) {'user': 'test'} (glob) |
173 8a76f55839e6badd47ed8338803d8bc16f578d68 0ea1d0d23e674ea8a6affe760741c82bb8e380f7 0 (*) {'user': 'test'} (glob) |
207 a98b35e86cae589b61892127c5ec1c868e41d910 286887947725085e03455d79649197feaef1eb9d 0 (*) {'user': 'test'} (glob) |
174 1e105584671a463974ee2122f95979ce5e507f1a b6099ccb49cae181af7c59ed5603a1dfca632445 0 (*) {'user': 'test'} (glob) |
208 5410a2352fa3114883327beee89e3085eefac25c 0b67cee46a7f2ad664f994027e7af95b36ae25fe 0 (*) {'user': 'test'} (glob) |
175 719157b217acc43d397369a448824ed4c7a302f2 8eb71353cb2c70fc1154be3af79c0ce98898ae88 ead904640c8543606f72490c6ae10955fb11fff0 0 (*) {'user': 'test'} (glob) |
209 719157b217acc43d397369a448824ed4c7a302f2 ced8fbcce3a7cd33f0e454d2cd63882ce1b6006b 73309fb98db840ba4ec5ad528346dc6ee0b39dcb 0 (*) {'user': 'test'} (glob) |
176 |
210 |
177 Cannot specify multiple revisions with -r |
211 Cannot specify multiple revisions with -r |
178 $ hg split -r "desc(_a)::" |
212 $ hg split -r "desc(_a)::" |
179 abort: you can only specify one revision to split |
213 abort: you can only specify one revision to split |
180 [255] |
214 [255] |