equal
deleted
inserted
replaced
54 o 0:07f494440405@default(draft) bk:[] adda |
54 o 0:07f494440405@default(draft) bk:[] adda |
55 |
55 |
56 $ hg debugobsolete |
56 $ hg debugobsolete |
57 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
57 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
58 c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) |
58 c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) |
59 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
59 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'} |
60 |
60 |
61 Test evolve with conflict |
61 Test evolve with conflict |
62 |
62 |
63 $ ls |
63 $ ls |
64 a |
64 a |
176 recreate:[12] newer a |
176 recreate:[12] newer a |
177 atop:[8] newer a |
177 atop:[8] newer a |
178 perform evolve? [Ny] y |
178 perform evolve? [Ny] y |
179 rebasing to destination parent: 66719795a494 |
179 rebasing to destination parent: 66719795a494 |
180 computing new diff |
180 computing new diff |
181 committed as e34e87ea7b83 |
181 committed as cd735a3aeb32 |
182 working directory is now at e34e87ea7b83 |
182 working directory is now at cd735a3aeb32 |
183 $ glog |
183 $ glog |
184 @ 14:e34e87ea7b83@default(draft) bk:[] bumped update to 1cf0aacfd363: |
184 @ 14:cd735a3aeb32@default(draft) bk:[] bumped update to 1cf0aacfd363: |
185 | |
185 | |
186 | o 9:7bc2f5967f5e@default(draft) bk:[] add c |
186 | o 9:7bc2f5967f5e@default(draft) bk:[] add c |
187 | | |
187 | | |
188 o | 8:1cf0aacfd363@default(public) bk:[] newer a |
188 o | 8:1cf0aacfd363@default(public) bk:[] newer a |
189 |/ |
189 |/ |
194 $ hg exp |
194 $ hg exp |
195 # HG changeset patch |
195 # HG changeset patch |
196 # User test |
196 # User test |
197 # Date 0 0 |
197 # Date 0 0 |
198 # Thu Jan 01 00:00:00 1970 +0000 |
198 # Thu Jan 01 00:00:00 1970 +0000 |
199 # Node ID 8fc63fe1f297f356d1156bbbbe865b9911efad74 |
199 # Node ID cd735a3aeb32e80b92f780c4ace1650597d581b2 |
200 # Parent 1cf0aacfd36310b18e403e1594871187e0364a82 |
200 # Parent 1cf0aacfd36310b18e403e1594871187e0364a82 |
201 phase-divergent update to 1cf0aacfd363: |
201 bumped update to 1cf0aacfd363: |
202 |
202 |
203 newer a |
203 newer a |
204 |
204 |
205 diff -r 1cf0aacfd363 -r 8fc63fe1f297 a |
205 diff -r 1cf0aacfd363 -r cd735a3aeb32 a |
206 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
206 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
207 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
207 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
208 @@ -1,3 +1,4 @@ |
208 @@ -1,3 +1,4 @@ |
209 a |
209 a |
210 a |
210 a |