hg split
Ernie Rael
errael at raelity.com
Sat Jun 13 00:25:42 UTC 2020
On 6/10/2020 6:41 AM, Pierre-Yves David wrote:
>
>
> On 4/11/20 4:47 PM, Ernie Rael wrote:
>> I thought I'd try "hg split" for the first time.
>>
>> help says:
>>
>> $ hg help -v split
>> ...
>> -i --[no-]interactive use interactive mode (default: on)
>>
>> Could it be that "default: on" should be "default: no"
>
> The default is "on" so that documentation is correct
>
>>
>> I did:
>>
>> $ hg split -r 1541 src/com/raelity/jvi/core/Misc.java
>> 16 files updated, 0 files merged, 1 files removed, 0 files unresolved
>> reverting nbproject/project.properties
>> reverting src/com/raelity/jvi/core/Misc.java
>> adding test/com/raelity/jvi/core/MiscTest.java
>> abort: running non-interactively, use commit instead
>
> That is strange. Can you past the result of `hg config ui`?
>
I updated everything and tried again.
$ hg version -v
Mercurial Distributed SCM (version 5.4)
...
Enabled extensions:
evolve external 10.0.0
hggit external 0.8.13 (dulwich 0.19.13)
transplant internal
...
Same failure (abort, and incorrect statement about non-interactive). I
tried it with the --no-interactive (editor came up twice for commit
messages) and it finished but left things in an incomplete state. I then did
$ hg evolve --all --any
$ hg up
And things look ok, including split as expected. Detail output follows.
-ernie
$ hg log -l15 -Trevsum
1459:02dc8ce918f2 draft Added tag nbvi-1.6.3 for changeset cd24fb05a58d
1458:cd24fb05a58d draft prep for 1.6.3
1457:c40e0155c046 draft Fix: use implementation dependency for SPI
1456:b1072b9ba8fa draft Added tag nbvi-1.6.2 for changeset b4c56b873f3d
1455:b4c56b873f3d draft 1.6.2 prep
1454:3327b859af48 draft Option display set combo max row count to 10;
all log level are shown
1453:131ce0c87bdc draft Standalone jvi now handles
Exceptions.printStackTrace dialog
1452:297fee3fded5 draft Fix. Create/use PreferencesImportMonitor. Rework
Filemark handling.
1451:d118c28201c8 draft Add interface ValueMap and class ValueHashMap.
1450:e492622735d1 public Fix. Class cast exception when click on folded
code popup.
1449:b8580f6ed33b public Clean up some deprecated warnings for post 1.8,
use clone segment cache.
$ hg split --no-interactive -r 1452 src/com/raelity/jvi/core/Misc.java
25 files updated, 0 files merged, 7 files removed, 0 files unresolved
reverting doc/notes/new-todo-list
reverting src/com/raelity/jvi/cmd/Jvi.java
reverting src/com/raelity/jvi/core/FPOS.java
reverting src/com/raelity/jvi/core/Filemark.java
reverting src/com/raelity/jvi/core/G.java
reverting src/com/raelity/jvi/core/MarkOps.java
reverting src/com/raelity/jvi/core/Misc.java
reverting src/com/raelity/jvi/core/Normal.java
reverting src/com/raelity/jvi/core/Options.java
reverting src/com/raelity/jvi/core/lib/PreferencesChangeMonitor.java
reverting src/com/raelity/jvi/lib/LibUtil.java
reverting src/com/raelity/jvi/manager/Scheduler.java
reverting src/com/raelity/jvi/manager/ViManager.java
reverting src/com/raelity/jvi/options/OptionsBeanBase.java
adding src/com/raelity/jvi/core/lib/PreferencesImportMonitor.java
created new head
no more change to split
7 new orphan changesets
### editor came up twice for commit messages
$ hg sum
parent: 1461:bf027d4d5a92 tip
Fix. Create/use PreferencesImportMonitor. Rework Filemark handling.
branch: default
commit: (clean)
update: 8 new changesets, 2 branch heads (merge)
phases: 11 draft
orphan: 7 changesets
$ hg glog -l15 -Trevsum
@ 1461:bf027d4d5a92 draft Fix. Create/use PreferencesImportMonitor.
Rework Filemark handling.
|
o 1460:9f4250124210 draft move misc out
|
| * 1459:02dc8ce918f2 draft Added tag nbvi-1.6.3 for changeset cd24fb05a58d
| |
| * 1458:cd24fb05a58d draft prep for 1.6.3
| |
| * 1457:c40e0155c046 draft Fix: use implementation dependency for SPI
| |
| * 1456:b1072b9ba8fa draft Added tag nbvi-1.6.2 for changeset b4c56b873f3d
| |
| * 1455:b4c56b873f3d draft 1.6.2 prep
| |
| * 1454:3327b859af48 draft Option display set combo max row count to
10; all log level are shown
| |
| * 1453:131ce0c87bdc draft Standalone jvi now handles
Exceptions.printStackTrace dialog
| |
| x 1452:297fee3fded5 draft Fix. Create/use PreferencesImportMonitor.
Rework Filemark handling.
|/
o 1451:d118c28201c8 draft Add interface ValueMap and class ValueHashMap.
|
o 1450:e492622735d1 public Fix. Class cast exception when click on
folded code popup.
|
o 1449:b8580f6ed33b public Clean up some deprecated warnings for post
1.8, use clone segment cache.
$ hg evolve --all --any
move:[1453] Standalone jvi now handles Exceptions.printStackTrace dialog
atop:[1461] Fix. Create/use PreferencesImportMonitor. Rework Filemark
handling.
move:[1454] Option display set combo max row count to 10; all log level
are shown
move:[1455] 1.6.2 prep
move:[1456] Added tag nbvi-1.6.2 for changeset b4c56b873f3d
move:[1457] Fix: use implementation dependency for SPI
move:[1458] prep for 1.6.3
move:[1459] Added tag nbvi-1.6.3 for changeset cd24fb05a58d
$ hg up
18 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg sum
parent: 1468:7694da880414 tip
Added tag nbvi-1.6.3 for changeset e2a0ce1a72c5
branch: default
bookmarks: @
commit: (clean)
update: (current)
phases: 10 draft
err at spirit /a/src/jvi-dev/trash/jvi
$ hg log -l15 -Trevsum
1468:7694da880414 draft Added tag nbvi-1.6.3 for changeset e2a0ce1a72c5
1467:e2a0ce1a72c5 draft prep for 1.6.3
1466:4eacbd64f88e draft Fix: use implementation dependency for SPI
1465:79ec670acaa1 draft Added tag nbvi-1.6.2 for changeset 5d8eae7e1975
1464:5d8eae7e1975 draft 1.6.2 prep
1463:c96fafc30e4a draft Option display set combo max row count to 10;
all log level are shown
1462:e60984e62f7d draft Standalone jvi now handles
Exceptions.printStackTrace dialog
1461:bf027d4d5a92 draft Fix. Create/use PreferencesImportMonitor. Rework
Filemark handling.
1460:9f4250124210 draft move misc out
1451:d118c28201c8 draft Add interface ValueMap and class ValueHashMap.
1450:e492622735d1 public Fix. Class cast exception when click on folded
code popup.
More information about the Mercurial
mailing list