monotone

monotone Commit Details

Date:2010-08-12 18:26:14 (8 years 9 months ago)
Author:Tony Cooper
Branch:net.venge.monotone.contrib.lib.automate-stdio
Commit:0a3e8feb53a972713f2f7e05196bb836fac0713f
Parents: b44faf1c5b5cd63c5b7381d207ffa25bba394326
Message:- Added support for Monotone version 0.48 by adding the update() method.

- Made the the code that reads format 2 chunk headers slightly more efficient
(avoids calling poll() more than it has to).
- Updated the documentation (and corrected a typo).
- Updated mtn-tester for Monotone version 0.48 and now added code to print out
the return value from the get_error_message() method after each test.
Changes:
Mlib/Monotone/AutomateStdio.pm (8 diffs)
Mlib/Monotone/AutomateStdio.pod (3 diffs)
Mmtn-tester (2 diffs)
Mmtn-tester-results.log (53 diffs)

File differences

lib/Monotone/AutomateStdio.pm
9999
100100
101101
102
102
103
103104
104105
105106
......
340341
341342
342343
344
343345
344346
345347
......
398400
399401
400402
403
401404
402405
403406
......
406409
407410
408411
409
412
410413
411414
412415
......
30343037
30353038
30363039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
30373089
30383090
30393091
......
37923844
37933845
37943846
3847
3848
3849
3850
3851
3852
3853
3854
37953855
37963856
37973857
......
48114871
48124872
48134873
4814
4874
48154875
48164876
48174877
......
48384898
48394899
48404900
4901
48414902
48424903
48434904
use constant MTN_STREAM_IO => 23;
use constant MTN_SYNCHRONISATION => 24;
use constant MTN_U_SELECTOR => 25;
use constant MTN_W_SELECTOR => 26;
use constant MTN_UPDATE => 26;
use constant MTN_W_SELECTOR => 27;
# Constants used to represent the different error levels.
sub sync($;$$@);
sub tags($$;$);
sub toposort($$@);
sub update($;$);
# Public aliased methods.
MTN_STREAM_IO
MTN_SYNCHRONISATION
MTN_U_SELECTOR
MTN_UPDATE
MTN_W_SELECTOR)],
severities => [qw(MTN_SEVERITY_ALL
MTN_SEVERITY_ERROR
MTN_T_STREAM)]);
our @EXPORT = qw();
Exporter::export_ok_tags(qw(capabilities severities streams));
our $VERSION = 0.08;
our $VERSION = 0.09;
#
##############################################################################
#
#
##############################################################################
#
# Routine - update
#
# Description - Updates the current workspace to the specified revision and
# possible branch. If no options are specified then the
# workspace is updated to the head revision of the current
# branch.
#
# Data - $self : The object.
# $options : A reference to a list containing the options
# to use.
# Return Value : True on success, otherwise false on failure.
#
##############################################################################
sub update($;$)
{
my($self, $options) = @_;
my($dummy,
@opts);
# Process any options.
if (defined($options))
{
for (my $i = 0; $i < scalar(@$options); ++ $i)
{
if ($$options[$i] eq "move-conflicting-paths")
{
push(@opts, {key => $$options[$i], value => ""});
}
else
{
push(@opts, {key => $$options[$i], value => $$options[++ $i]});
}
}
}
# Run the command.
return $self->mtn_command_with_options("update", 1, 1, \$dummy, \@opts);
}
#
##############################################################################
#
# Routine - closedown
#
# Description - If started then stop the mtn subprocess.
return 1 if ($this->{mtn_aif_version} >= 12);
}
elsif ($feature == MTN_UPDATE)
{
# This is only available from version 0.48 (i/f version 12.1).
return 1 if ($this->{mtn_aif_version} >= 12.1);
}
else
{
&$croaker("Unknown feature requested");
$$offset_ref += $bytes_read;
}
else
if ($size <= 0)
{
# We have finished processing the current data chunk so if it
$chunk_start = 1;
}
}
elsif ($size == 1)
{
lib/Monotone/AutomateStdio.pod
3636
3737
3838
39
39
4040
4141
4242
......
993993
994994
995995
996
996
997997
998998
999999
......
10171017
10181018
10191019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
10201036
10211037
10221038
All automate commands have been implemented in this class except for the
`stdio' command, hopefully the reason is obvious :-). Versions of Monotone that
are supported by this class range from 0.35 up to and including the latest
version (currently 0.47). If you happen to be using a newer version of Monotone
version (currently 0.48). If you happen to be using a newer version of Monotone
then this class will hopefully largely work but without the support for new or
changed features.
"key-to-push" => "me@mydomain.com",
"max-netsync-version" => 2,
"min-netsync-version" => 1,
"set-default");
"set-default"]);
(feature: MTN_SYNCHRONISATION)
Sort the specified revision ids such that the ancestors come out first.
=item B<$mtn-E<gt>update([@options])>
Updates the current workspace to the specified revision and possible branch. If
no options are specified then the workspace is updated to the head revision of
the current branch.
The $options argument is a list of valid options, with some having
arguments. For example, one could call this method specifying all of the
options like this:
$mtn->update(["branch" => "experiments.hacks",
"move-conflicting-paths",
"revision" => "h:"]);
(feature: MTN_UPDATE)
=back
=head1 RETURN VALUE
mtn-tester
686686
687687
688688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
689726
690727
691728
......
838875
839876
840877
878
879
841880
842881
843882
{
print($branch . "\n");
}
}},
{fn => undef,
desc => "update",
feat => MTN_UPDATE,
type => CODE,
code => sub {
foreach my $op ([revision => "i:1d8d91f5976860dbcabe209829ff"
. "2e34d8119a58"],
[branch => "net.venge.monotone",
revision => "i:c2de1dbfe651d26a0d0a33d43c50"
. "444583c5dad8"],
[branch => "net.venge.monotone.contrib.lib"
. ".automate-stdio.test",
revision => "h:"])
{
my($p_buffer,
$pfh,
$t_buffer,
$tfh);
$p_buffer = $t_buffer = "";
open($pfh, ">", \$p_buffer);
open($tfh, ">", \$t_buffer);
$mtn->register_stream_handle(MTN_P_STREAM, $pfh);
$mtn->register_stream_handle(MTN_T_STREAM, $tfh);
$mtn->update($op);
$mtn->register_stream_handle(MTN_P_STREAM, undef);
$mtn->register_stream_handle(MTN_T_STREAM, undef);
$pfh->close();
$tfh->close();
print(" ----- Output of progress stream -----\n");
print($p_buffer);
print("\n ----------\n");
print(" ----- Output of ticker stream -----\n");
print($t_buffer);
print("\n ----------\n");
}
}});
print <<EOF;
{
$test->{posc}();
}
printf("\nget_error_message() method returned `%s'\n",
$mtn->get_error_message());
}
}
mtn-tester-results.log
83488348
83498349
83508350
8351
8352
83518353
83528354
83538355
......
83718373
83728374
83738375
8376
8377
83748378
83758379
83768380
......
84948498
84958499
84968500
8501
8502
84978503
84988504
8505
8506
84998507
85008508
85018509
......
85698577
85708578
85718579
8580
8581
85728582
85738583
85748584
85758585
85768586
8587
8588
85778589
85788590
85798591
......
1687916891
1688016892
1688116893
16894
16895
1688216896
1688316897
16884
16885
16886
16887
16888
16889
16890
16891
16892
16893
16894
16895
16896
16897
16898
16899
16900
16901
16902
16903
16904
16905
16906
16907
16908
16909
16910
16911
16912
16913
1691416898
1691516899
1691616900
......
1742317407
1742417408
1742517409
17410
17411
17412
17413
17414
17415
17416
17417
17418
17419
17420
17421
17422
17423
17424
17425
17426
17427
17428
17429
17430
17431
17432
17433
17434
17435
17436
17437
17438
17439
17440
17441
17442
17443
17444
17445
17446
17447
17448
17449
17450
17451
17452
17453
17454
17455
17456
17457
17458
17459
17460
17461
17462
17463
17464
17465
17466
17467
17468
17469
17470
17471
17472
17473
17474
17475
17476
17477
17478
17479
17480
17481
17482
17483
17484
17485
17486
17487
17488
17489
17490
17491
17492
17493
17494
17495
17496
17497
17498
17499
17500
17501
17502
17503
17504
17505
17506
17507
17508
17509
17510
17511
17512
17513
17514
17515
17516
17517
17518
17519
17520
17521
17522
17523
17524
17525
17526
17527
17528
17529
17530
17531
17532
17533
17534
17535
17536
17537
17538
17539
17540
17541
17542
17543
17544
17545
17546
17547
17548
17549
17550
17551
17552
17553
17554
17555
17556
17557
17558
17559
17560
17561
17562
17563
17564
17565
17566
17567
17568
17569
17570
17571
17572
17573
17574
17575
17576
1742617577
1742717578
1742817579
......
1744117592
1744217593
1744317594
17595
17596
17597
17598
17599
17600
17601
17602
17603
17604
17605
17606
17607
17608
17609
17610
17611
17612
17613
17614
17615
17616
17617
17618
17619
17620
17621
17622
17623
17624
17625
17626
1744417627
1744517628
1744617629
......
1747317656
1747417657
1747517658
17659
17660
1747617661
1747717662
17478
17479
17480
17481
17482
17483
17484
17485
17486
17487
17488
17489
17490
17491
17492
17493
17494
17495
17496
17497
17498
17499
17500
17501
17502
17503
17504
17505
17506
17507
1750817663
1750917664
1751017665
......
1801618171
1801718172
1801818173
18174
18175
18176
18177
18178
18179
18180
18181
18182
18183
18184
18185
18186
18187
18188
18189
18190
18191
18192
18193
18194
18195
18196
18197
18198
18199
18200
18201
18202
18203
18204
18205
18206
18207
18208
18209
18210
18211
18212
18213
18214
18215
18216
18217
18218
18219
18220
18221
18222
18223
18224
18225
18226
18227
18228
18229
18230
18231
18232
18233
18234
18235
18236
18237
18238
18239
18240
18241
18242
18243
18244
18245
18246
18247
18248
18249
18250
18251
18252
18253
18254
18255
18256
18257
18258
18259
18260
18261
18262
18263
18264
18265
18266
18267
18268
18269
18270
18271
18272
18273
18274
18275
18276
18277
18278
18279
18280
18281
18282
18283
18284
18285
18286
18287
18288
18289
18290
18291
18292
18293
18294
18295
18296
18297
18298
18299
18300
18301
18302
18303
18304
18305
18306
18307
18308
18309
18310
18311
18312
18313
18314
18315
18316
18317
18318
18319
18320
18321
18322
18323
18324
18325
18326
18327
18328
18329
18330
18331
18332
18333
18334
18335
18336
18337
18338
18339
18340
18341
18342
18343
18344
18345
18346
18347
18348
18349
18350
18351
18352
18353
18354
18355
18356
18357
18358
18359
18360
18361
18362
18363
18364
18365
18366
18367
18368
18369
18370
18371
18372
1801918373
1802018374
1802118375
......
1806918423
1807018424
1807118425
18072
18073
18074
18075
18076
18077
18078
18079
18080
18081
18082
18083
18084
18085
18086
18087
18088
18089
18090
18091
18092
18093
18094
18095
18096
18097
18098
18099
18100
18101
1810218426
1810318427
1810418428
......
1861018934
1861118935
1861218936
18937
18938
18939
18940
18941
18942
18943
18944
18945
18946
18947
18948
18949
18950
18951
18952
18953
18954
18955
18956
18957
18958
18959
18960
18961
18962
18963
18964
18965
18966
18967
18968
18969
18970
18971
18972
18973
18974
18975
18976
18977
18978
18979
18980
18981
18982
18983
18984
18985
18986
18987
18988
18989
18990
18991
18992
18993
18994
18995
18996
18997
18998
18999
19000
19001
19002
19003
19004
19005
19006
19007
19008
19009
19010
19011
19012
19013
19014
19015
19016
19017
19018
19019
19020
19021
19022
19023
19024
19025
19026
19027
19028
19029
19030
19031
19032
19033
19034
19035
19036
19037
19038
19039
19040
19041
19042
19043
19044
19045
19046
19047
19048
19049
19050
19051
19052
19053
19054
19055
19056
19057
19058
19059
19060
19061
19062
19063
19064
19065
19066
19067
19068
19069
19070
19071
19072
19073
19074
19075
19076
19077
19078
19079
19080
19081
19082
19083
19084
19085
19086
19087
19088
19089
19090
19091
19092
19093
19094
19095
19096
19097
19098
19099
19100
19101
19102
19103
19104
19105
19106
19107
19108
19109
19110
19111
19112
19113
19114
19115
19116
19117
19118
19119
19120
19121
19122
19123
19124
19125
19126
19127
19128
19129
19130
19131
19132
19133
19134
19135
1861319136
1861419137
1861519138
......
1864019163
1864119164
1864219165
19166
19167
1864319168
1864419169
19170
19171
1864519172
1864619173
1864719174
......
1865019177
1865119178
1865219179
19180
19181
1865319182
1865419183
1865519184
1865619185
1865719186
19187
19188
1865819189
1865919190
1866019191
......
1949220023
1949320024
1949420025
20026
20027
1949520028
1949620029
1949720030
1949820031
1949920032
19500
19501
19502
19503
19504
19505
20033
20034
20035
20036
20037
20038
1950620039
20040
20041
1950720042
1950820043
19509
20044
1951020045
1951120046
1951220047
......
1951620051
1951720052
1951820053
20054
20055
1951920056
1952020057
1952120058
1952220059
20060
20061
1952320062
1952420063
1952520064
......
1953220071
1953320072
1953420073
20074
20075
1953520076
1953620077
1953720078
......
1955220093
1955320094
1955420095
20096
20097
1955520098
1955620099
20100
20101
1955720102
1955820103
1955920104
1956020105
1956120106
20107
20108
1956220109
1956320110
20111
20112
1956420113
1956520114
1956620115
......
1962820177
1962920178
1963020179
20180
20181
1963120182
1963220183
1963320184
......
1965720208
1965820209
1965920210
20211
20212
1966020213
1966120214
1966220215
......
1968620239
1968720240
1968820241
20242
20243
1968920244
1969020245
1969120246
......
1972720282
1972820283
1972920284
20285
20286
1973020287
1973120288
1973220289
......
1976820325
1976920326
1977020327
20328
20329
1977120330
1977220331
20332
20333
1977320334
1977420335
20336
20337
1977520338
1977620339
1977720340
......
1980320366
1980420367
1980520368
20369
20370
1980620371
1980720372
1980820373
......
2052821093
2052921094
2053021095
21096
21097
2053121098
2053221099
2053321100
......
2070321270
2070421271
2070521272
21273
21274
2070621275
2070721276
2070821277
......
4185642425
4185742426
4185842427
42428
42429
4185942430
4186042431
42432
42433
4186142434
41862
42435
42436
42437
4186342438
4186442439
4186542440
......
4189442469
4189542470
4189642471
42472
42473
4189742474
41898
42475
42476
42477
4189942478
4190042479
4190142480
......
151184151763
151185151764
151186151765
151766
151767
151187151768
151188151769
151189151770
151190151771
151772
151773
151191151774
151192151775
151776
151777
151193151778
151194151779
151195151780
......
192878193463
192879193464
192880193465
193466
193467
192881193468
192882193469
192883193470
......
197081197668
197082197669
197083197670
197671
197672
197084197673
197085197674
197086197675
......
238752239341
238753239342
238754239343
239344
239345
238755239346
238756239347
238757239348
......
280423281014
280424281015
280425281016
281017
281018
280426281019
280427281020
280428281021
280429281022
281023
281024
280430281025
280431281026
280432281027
......
280453281048
280454281049
280455281050
281051
281052
280456281053
280457281054
281055
281056
281057
281058
281059
281060
281061
280458281062
280459281063
280460281064
......
280575281179
280576281180
280577281181
281182
281183
281184
281185
281186
281187
281188
281189
281190
281191
280578281192
280579281193
280580281194
......
280729281343
280730281344
280731281345
281346
281347
280732281348
280733281349
280734281350
......
280756281372
280757281373
280758281374
281375
281376
281377
281378
281379
281380
280759281381
280760281382
280761281383
......
280856281478
280857281479
280858281480
280859
280860
280861
280862
280863
280864
280865281481
280866281482
280867281483
......
281075281691
281076281692
281077281693
281694
281695
281696
281697
281698
281699
281700
281701
281702
281703
281704
281705
281078281706
281079281707
281080281708
......
281235281863
281236281864
281237281865
281238
281239
281240
281241
281242
281243
281244
281245
281246
281247
281248
281249
281250281866
281251281867
281252281868
......
281523282139
281524282140
281525282141
282142
282143
281526282144
281527282145
281528282146
......
281680282298
281681282299
281682282300
282301
282302
281683282303
281684282304
282305
282306
281685282307
281686282308
281687282309
281688282310
282311
282312
281689282313
281690282314
281691282315
281692282316
281693282317
282318
282319
281694282320
281695282321
281696282322
281697282323
282324
282325
281698282326
281699282327
281700282328
......
281726282354
281727282355
281728282356
282357
282358
281729282359
281730282360
281731282361
282362
282363
281732282364
281733282365
281734282366
......
281741282373
281742282374
281743282375
281744
282376
281745282377
281746
281747
281748
281749
282378
282379
282380
282381
281750282382
281751
281752
282383
281753282384
281754
281755
281756282385
281757
282386
282387
282388
282389
282390
282391
281758282392
281759
281760
281761
281762
282393
282394
282395
282396
281763282397
281764
281765
282398
281766282399
281767
281768
281769282400
281770
281771
281772
281773
281774
281775
281776
281777282401
281778
281779
282402
281780282403
281781
282404
281782282405
282406
282407
282408
282409
282410
282411
282412
282413
282414
282415
281783282416
281784282417
281785282418
281786
282419
281787282420
281788282421
281789282422
281790282423
281791
282424
282425
282426
282427
282428
282429
282430
282431
282432
281792282433
281793
281794
281795
281796
282434
282435
282436
282437
281797282438
281798
281799
282439
281800282440
281801
282441
281802282442
281803
282443
281804282444
281805
282445
282446
282447
281806282448
281807
281808
281809
281810
282449
282450
282451
282452
281811282453
281812
281813
282454
281814282455
281815
282456
281816282457
281817
282458
281818282459
282460
282461
282462
282463
281819282464
281820282465
281821282466
......
281866282511
281867282512
281868282513
281869
282514
281870282515
281871282516
281872282517
......
281885282530
281886282531
281887282532
281888
282533
281889282534
282535
282536
281890282537
281891282538
281892282539
......
281923282570
281924282571
281925282572
282573
282574
281926282575
281927282576
281928282577
......
281958282607
281959282608
281960282609
282610
282611
281961282612
281962282613
282614
282615
281963282616
281964282617
281965282618
......
281992282645
281993282646
281994282647
282648
282649
281995282650
281996282651
281997282652
......
282026282681
282027282682
282028282683
282684
282685
282029282686
282030282687
282031282688
......
283731284388
283732284389
283733284390
284391
284392
283734284393
283735284394
283736284395
......
283774284433
283775284434
283776284435
284436
284437
283777284438
283778284439
283779284440
283780284441
283781284442
283782284443
284444
284445
283783284446
283784284447
283785
284448
283786284449
283787284450
283788284451
......
283801284464
283802284465
283803284466
284467
284468
283804284469
283805284470
283806284471
......
283922284587
283923284588
283924284589
283925
284590
284591
284592
283926284593
283927
284594
283928284595
283929284596
'ffee1cc3953e31ba713f722223299a64983a047b',
'fff5dc58f79e696858a39004c8d125a35e182e6a'
];
get_error_message() method returned `'
========== ancestry_difference ==========
$VAR1 = [
'1d848e1155d9c78c0810c7cacf3fdca53cd21b5c',
'3b20f1a82690cdb8fc6570637fe0526a7aeb1872',
'f06e40cb1d2b4f5c0db387e7a6c37681f1f89294'
];
get_error_message() method returned `'
========== branches ==========
$VAR1 = [
'net.venge.monotone',
'net.venge.monotone.workspace-merge.conflict1',
'net.venge.monotone.ws_automate'
];
get_error_message() method returned `'
========== cert ==========
Added the daleks cert
get_error_message() method returned `'
========== certs ==========
---------- Raw Data ----------
key [7fe029d85af4de40700778b9784ef488fac2c79c]
'key' => '7fe029d85af4de40700778b9784ef488fac2c79c'
}
];
get_error_message() method returned `'
========== children ==========
$VAR1 = [
'05cb265ad778107218701fa76a91bdf4770b85a8',
'110816e646d42ca45e8205778255cece9c8f2159'
];
get_error_message() method returned `'
========== common_ancestors ==========
$VAR1 = [
'0005a23e30a9c2d3024d94773eec433bf9acb770',
'ffee1cc3953e31ba713f722223299a64983a047b',
'fff5dc58f79e696858a39004c8d125a35e182e6a'
];
get_error_message() method returned `'
========== content_diff (revision) ==========
============================================================
--- DO-NOT-USEda39a3ee5e6b4b0d3255bfef95601890afd80709
+++ DO-NOT-USEda39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- README-FIRSTfa4a0466d6c105cf3984af5fe3416c3097452be5
+++ README-FIRSTfa4a0466d6c105cf3984af5fe3416c3097452be5
@@ -0,0 +1,5 @@
+This is a test branch for the Monotone::AutomateStdio Perl library. This branch
+is branched off from Monotone version 0.41 and contains random changes in order
+to exercise specific bits of the automate stdio interface and the
+Monotone::AutomateStdio library. This branch must in no way ever be merged back
+to the main Monotone branch.
============================================================
--- script1cd89bae8485ee5a3532bb35c764ef43239098af8
+++ script1cd89bae8485ee5a3532bb35c764ef43239098af8
@@ -0,0 +1,3 @@
+#!/bin/sh
+ls -la
+exit 0
============================================================
--- script2cd89bae8485ee5a3532bb35c764ef43239098af8
+++ script2cd89bae8485ee5a3532bb35c764ef43239098af8
@@ -0,0 +1,3 @@
+#!/bin/sh
+ls -la
+exit 0
============================================================
# snowdonia.jpg is binary
============================================================
# snowdonia.xcf is binary
============================================================
--- COPYING06877624ea5c77efe3b7e39b0f909eda6e25a4ec
+++ COPYING7d7e3bd4448ca5450c1a211675734ed6a5eae18a
@@ -1,8 +1,8 @@
$(SANITY_CORE_SOURCES) $(LUAEXT_SOURCES) platform-wrapped.hh\
rev_types.hh mtn-sanity.cc mtn-sanity.hh ui.cc ui.hh\
============================================================
--- platform.hh7b09b4e28d7c7379e6336a3fa8d76cf937d3ac1f
+++ /dev/null
@@ -1,163 +0,0 @@
-#ifndef __PLATFORM_HH__
-#define __PLATFORM_HH__
-
-// Copyright (C) 2002 Graydon Hoare <graydon@pobox.com>
-//
-// This program is made available under the GNU GPL version 2.0 or
-// greater. See the accompanying file COPYING for details.
-//
-// This program is distributed WITHOUT ANY WARRANTY; without even the
-// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE.
-
-// this describes functions to be found, alternatively, in win32/* or unix/*
-// directories.
-
-
-#include <stdio.h>
-
-void read_password(std::string const & prompt, char * buf, size_t bufsz);
-void get_system_flavour(std::string & ident);
-bool is_executable(const char *path);
-
-// For LUA
-int existsonpath(const char *exe);
-int make_executable(const char *path);
-pid_t process_spawn(const char * const argv[]);
-pid_t process_spawn_redirected(char const * in,
- char const * out,
- char const * err,
- char const * const argv[]);
-pid_t process_spawn_pipe(char const * const argv[], FILE** in, FILE** out);
-int process_wait(pid_t pid, int *res, int timeout = -1);// default infinite
-int process_kill(pid_t pid, int signal);
-int process_sleep(unsigned int seconds);
-
-// stop "\n"->"\r\n" from breaking automate on Windows
-void make_io_binary();
-
-#ifdef WIN32
-std::string munge_argv_into_cmdline(const char* const argv[]);
-#endif
-// for term selection
-bool have_smart_terminal();
-// this function cannot call W/P/L, because it is called by the tick printing
-// code.
-// return value of 0 means "unlimited"
-unsigned int terminal_width();
-
-// for "reckless mode" workspace change detection.
-// returns 'true' if it has generated a valid inodeprint; returns 'false' if
-// there was a problem, in which case we should act as if the inodeprint has
-// changed.
-class inodeprint_calculator
-{
-public:
- template<typename T> void add_item(T obj)
- {
- size_t size(sizeof(obj));
- add_item(&size, sizeof(size));
- add_item(&obj, sizeof(obj));
- }
- // When adding a time to the print use these to note if it's
- // close to the current time (within about 3 seconds) or
- // in the future.
- // To make this more robust, there are some tricks:
- // -- we refuse to inodeprint files whose times are within a few seconds of
- // 'now'. This is because, we might memorize the inodeprint, then
- // someone writes to the file, and this write does not update the
- // timestamp -- or rather, it does update the timestamp, but nothing
- // happens, because the new value is the same as the old value. We use
- // "a few seconds" to make sure that it is larger than whatever the
- // filesystem's timekeeping granularity is (rounding to 2 seconds is
- // known to exist in the wild).
- // -- by the same reasoning, we should also refuse to inodeprint files whose
- // time is in the future, because it is possible that someone will write
- // to that file exactly when that future second arrives, and we will
- // never notice. However, this would create persistent and hard to
- // diagnosis slowdowns, whenever a tree accidentally had its times set
- // into the future. Therefore, to handle this case, we include a "is
- // this time in the future?" bit in the hashed information. This bit
- // will change when we pass the future point, and trigger a re-check of
- // the file's contents.
- //
- // This is, of course, still not perfect. There is no way to make our stat
- // atomic with the actual read of the file, so there's always a race condition
- // there. Additionally, this handling means that checkout will never actually
- // inodeprint anything, but rather the first command after checkout will be
- // slow. There doesn't seem to be anything that could be done about this.
- virtual void note_future(bool f = true) = 0;
- virtual void note_nowish(bool f = true) = 0;
- virtual ~inodeprint_calculator() {};
-protected:
- virtual void add_item(void *dat, size_t size) = 0;
-};
-bool inodeprint_file(std::string const & file, inodeprint_calculator & calc);
-
-// for netsync 'serve' pidfile support
-pid_t get_process_id();
-
-// netsync wants to ignore sigpipe; this is meaningless on Win32
-#ifdef WIN32
-inline void ignore_sigpipe() {}
-#else
-void ignore_sigpipe(); // in unix/process.cc
-#endif
-
-// filesystem stuff
-// FIXME: BUG: this returns a string in the filesystem charset/encoding
-std::string get_current_working_dir();
-// calls N() if fails
-void change_current_working_dir(std::string const & to);
-std::string tilde_expand(std::string const & path);
-std::string get_default_confdir();
-
-inline std::string get_default_keydir()
-{ return get_default_confdir() + "/keys"; }
-
-std::string get_homedir();
-namespace path
-{
- typedef enum { nonexistent, directory, file } status;
-};
-path::status get_path_status(std::string const & path);
-
-struct dirent_consumer
-{
- virtual ~dirent_consumer() {}
- virtual void consume(const char *) = 0;
-};
-void do_read_directory(std::string const & path,
- dirent_consumer & files,
- dirent_consumer & dirs,
- dirent_consumer & other_files);
-
-void rename_clobberingly(std::string const & from, std::string const & to);
-void do_remove(std::string const & path);
-
-void do_mkdir(std::string const & path);
-void write_data_worker(std::string const & p,
- std::string const & dat,
- std::string const & tmpdir,
- bool user_private);
-
-// strerror wrapper for OS-specific errors (e.g. use FormatMessage on Win32)
-std::string os_strerror(os_err_t errnum);
-
-// for running cpu benchmarks
-// Returns the processor time used by the current process, plus some
-// arbitrary constant, measured in seconds.
-double cpu_now();
-
-// determine directory to load locale data from
-std::string get_locale_dir();
-
-// Local Variables:
-// mode: C++
-// fill-column: 76
-// c-file-style: "gnu"
-// indent-tabs-mode: nil
-// End:
-// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:
-
-#endif // __PLATFORM_HH__
============================================================
--- options.cce89af04e97c53b86bbfff144e567a6bfd7535357
+++ options.cc4b4e070919a897c989788b825f477d9683c5bcc3
@@ -15,15 +15,6 @@ using std::string;
std::map<options::static_options_fun, std::set<options::static_options_fun> > &
options::children()
{
============================================================
--- /dev/null
+++ README-FIRSTfa4a0466d6c105cf3984af5fe3416c3097452be5
@@ -0,0 +1,5 @@
+This is a test branch for the Monotone::AutomateStdio Perl library. This branch
+is branched off from Monotone version 0.41 and contains random changes in order
+to exercise specific bits of the automate stdio interface and the
+Monotone::AutomateStdio library. This branch must in no way ever be merged back
+to the main Monotone branch.
============================================================
--- /dev/null
+++ script1cd89bae8485ee5a3532bb35c764ef43239098af8
@@ -0,0 +1,3 @@
+#!/bin/sh
+ls -la
+exit 0
============================================================
--- /dev/null
+++ script2cd89bae8485ee5a3532bb35c764ef43239098af8
@@ -0,0 +1,3 @@
+#!/bin/sh
+ls -la
+exit 0
============================================================
# snowdonia.jpg is binary
============================================================
# snowdonia.xcf is binary
============================================================
--- /dev/null
+++ DO-NOT-USEda39a3ee5e6b4b0d3255bfef95601890afd80709
get_error_message() method returned `'
========== content_diff (file) ==========
============================================================
--- Makefile.am1fb3c2eee0fbdba632764b1eaa1aa61c5596665a
MOST_SOURCES = \
$(SANITY_CORE_SOURCES) $(LUAEXT_SOURCES) platform-wrapped.hh\
rev_types.hh mtn-sanity.cc mtn-sanity.hh ui.cc ui.hh\
get_error_message() method returned `including missing parent '''
========== content_diff (file - options excluding options.cc) ==========
============================================================
--- DO-NOT-USEda39a3ee5e6b4b0d3255bfef95601890afd80709
+++ DO-NOT-USEda39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- README-FIRSTfa4a0466d6c105cf3984af5fe3416c3097452be5
+++ README-FIRSTfa4a0466d6c105cf3984af5fe3416c3097452be5
@@ -0,0 +1,5 @@
+This is a test branch for the Monotone::AutomateStdio Perl library. This branch
+is branched off from Monotone version 0.41 and contains random changes in order
+to exercise specific bits of the automate stdio interface and the
+Monotone::AutomateStdio library. This branch must in no way ever be merged back
+to the main Monotone branch.
============================================================
--- script1cd89bae8485ee5a3532bb35c764ef43239098af8
+++ script1cd89bae8485ee5a3532bb35c764ef43239098af8
@@ -0,0 +1,3 @@
+#!/bin/sh
+ls -la
+exit 0
============================================================
--- script2cd89bae8485ee5a3532bb35c764ef43239098af8
+++ script2cd89bae8485ee5a3532bb35c764ef43239098af8
@@ -0,0 +1,3 @@
+#!/bin/sh
+ls -la
+exit 0
============================================================
# snowdonia.jpg is binary
============================================================
# snowdonia.xcf is binary
============================================================
--- COPYING06877624ea5c77efe3b7e39b0f909eda6e25a4ec
+++ COPYING7d7e3bd4448ca5450c1a211675734ed6a5eae18a
@@ -1,8 +1,8 @@
MOST_SOURCES = \
$(SANITY_CORE_SOURCES) $(LUAEXT_SOURCES) platform-wrapped.hh\
rev_types.hh mtn-sanity.cc mtn-sanity.hh ui.cc ui.hh\
============================================================
--- platform.hh7b09b4e28d7c7379e6336a3fa8d76cf937d3ac1f
+++ /dev/null
@@ -1,163 +0,0 @@
-#ifndef __PLATFORM_HH__
-#define __PLATFORM_HH__
-
-// Copyright (C) 2002 Graydon Hoare <graydon@pobox.com>
-//
-// This program is made available under the GNU GPL version 2.0 or
-// greater. See the accompanying file COPYING for details.
-//
-// This program is distributed WITHOUT ANY WARRANTY; without even the
-// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE.
-
-// this describes functions to be found, alternatively, in win32/* or unix/*
-// directories.
-
-
-#include <stdio.h>
-
-void read_password(std::string const & prompt, char * buf, size_t bufsz);
-void get_system_flavour(std::string & ident);
-bool is_executable(const char *path);
-
-// For LUA
-int existsonpath(const char *exe);
-int make_executable(const char *path);
-pid_t process_spawn(const char * const argv[]);
-pid_t process_spawn_redirected(char const * in,
- char const * out,
- char const * err,
- char const * const argv[]);
-pid_t process_spawn_pipe(char const * const argv[], FILE** in, FILE** out);
-int process_wait(pid_t pid, int *res, int timeout = -1);// default infinite
-int process_kill(pid_t pid, int signal);
-int process_sleep(unsigned int seconds);
-
-// stop "\n"->"\r\n" from breaking automate on Windows
-void make_io_binary();
-
-#ifdef WIN32
-std::string munge_argv_into_cmdline(const char* const argv[]);
-#endif
-// for term selection
-bool have_smart_terminal();
-// this function cannot call W/P/L, because it is called by the tick printing
-// code.
-// return value of 0 means "unlimited"
-unsigned int terminal_width();
-
-// for "reckless mode" workspace change detection.
-// returns 'true' if it has generated a valid inodeprint; returns 'false' if
-// there was a problem, in which case we should act as if the inodeprint has
-// changed.
-class inodeprint_calculator
-{
-public:
- template<typename T> void add_item(T obj)
- {
- size_t size(sizeof(obj));
- add_item(&size, sizeof(size));
- add_item(&obj, sizeof(obj));
- }
- // When adding a time to the print use these to note if it's
- // close to the current time (within about 3 seconds) or
- // in the future.
- // To make this more robust, there are some tricks:
- // -- we refuse to inodeprint files whose times are within a few seconds of
- // 'now'. This is because, we might memorize the inodeprint, then
- // someone writes to the file, and this write does not update the
- // timestamp -- or rather, it does update the timestamp, but nothing
- // happens, because the new value is the same as the old value. We use
- // "a few seconds" to make sure that it is larger than whatever the
- // filesystem's timekeeping granularity is (rounding to 2 seconds is
- // known to exist in the wild).
- // -- by the same reasoning, we should also refuse to inodeprint files whose
- // time is in the future, because it is possible that someone will write
- // to that file exactly when that future second arrives, and we will
- // never notice. However, this would create persistent and hard to
- // diagnosis slowdowns, whenever a tree accidentally had its times set
- // into the future. Therefore, to handle this case, we include a "is
- // this time in the future?" bit in the hashed information. This bit
- // will change when we pass the future point, and trigger a re-check of
- // the file's contents.
- //
- // This is, of course, still not perfect. There is no way to make our stat
- // atomic with the actual read of the file, so there's always a race condition
- // there. Additionally, this handling means that checkout will never actually
- // inodeprint anything, but rather the first command after checkout will be
- // slow. There doesn't seem to be anything that could be done about this.
- virtual void note_future(bool f = true) = 0;
- virtual void note_nowish(bool f = true) = 0;
- virtual ~inodeprint_calculator() {};
-protected:
- virtual void add_item(void *dat, size_t size) = 0;
-};
-bool inodeprint_file(std::string const & file, inodeprint_calculator & calc);
-
-// for netsync 'serve' pidfile support
-pid_t get_process_id();
-
-// netsync wants to ignore sigpipe; this is meaningless on Win32
-#ifdef WIN32
-inline void ignore_sigpipe() {}
-#else
-void ignore_sigpipe(); // in unix/process.cc
-#endif
-
-// filesystem stuff
-// FIXME: BUG: this returns a string in the filesystem charset/encoding
-std::string get_current_working_dir();
-// calls N() if fails
-void change_current_working_dir(std::string const & to);
-std::string tilde_expand(std::string const & path);
-std::string get_default_confdir();
-
-inline std::string get_default_keydir()
-{ return get_default_confdir() + "/keys"; }
-
-std::string get_homedir();
-namespace path
-{
- typedef enum { nonexistent, directory, file } status;
-};
-path::status get_path_status(std::string const & path);
-
-struct dirent_consumer
-{
- virtual ~dirent_consumer() {}
- virtual void consume(const char *) = 0;
-};
-void do_read_directory(std::string const & path,
- dirent_consumer & files,
- dirent_consumer & dirs,
- dirent_consumer & other_files);
-
-void rename_clobberingly(std::string const & from, std::string const & to);
-void do_remove(std::string const & path);
-
-void do_mkdir(std::string const & path);
-void write_data_worker(std::string const & p,
- std::string const & dat,
- std::string const & tmpdir,
- bool user_private);
-
-// strerror wrapper for OS-specific errors (e.g. use FormatMessage on Win32)
-std::string os_strerror(os_err_t errnum);
-
-// for running cpu benchmarks
-// Returns the processor time used by the current process, plus some
-// arbitrary constant, measured in seconds.
-double cpu_now();
-
-// determine directory to load locale data from
-std::string get_locale_dir();
-
-// Local Variables:
-// mode: C++
-// fill-column: 76
-// c-file-style: "gnu"
-// indent-tabs-mode: nil
-// End:
-// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:
-
-#endif // __PLATFORM_HH__
============================================================
--- /dev/null
+++ README-FIRSTfa4a0466d6c105cf3984af5fe3416c3097452be5
@@ -0,0 +1,5 @@
+This is a test branch for the Monotone::AutomateStdio Perl library. This branch
+is branched off from Monotone version 0.41 and contains random changes in order
+to exercise specific bits of the automate stdio interface and the
+Monotone::AutomateStdio library. This branch must in no way ever be merged back
+to the main Monotone branch.
============================================================
--- /dev/null
+++ script1cd89bae8485ee5a3532bb35c764ef43239098af8
@@ -0,0 +1,3 @@
+#!/bin/sh
+ls -la
+exit 0
============================================================
--- /dev/null
+++ script2cd89bae8485ee5a3532bb35c764ef43239098af8
@@ -0,0 +1,3 @@
+#!/bin/sh
+ls -la
+exit 0
============================================================
# snowdonia.jpg is binary
============================================================
# snowdonia.xcf is binary
============================================================
--- /dev/null
+++ DO-NOT-USEda39a3ee5e6b4b0d3255bfef95601890afd80709
get_error_message() method returned `including missing parent '''
========== content_diff (file - options excluding options.cc) ==========
#
#
# value "true"
#
============================================================
--- DO-NOT-USEda39a3ee5e6b4b0d3255bfef95601890afd80709
+++ DO-NOT-USEda39a3ee5e6b4b0d3255bfef95601890afd80709
============================================================
--- README-FIRSTfa4a0466d6c105cf3984af5fe3416c3097452be5
+++ README-FIRSTfa4a0466d6c105cf3984af5fe3416c3097452be5
@@ -0,0 +1,5 @@
+This is a test branch for the Monotone::AutomateStdio Perl library. This branch
+is branched off from Monotone version 0.41 and contains random changes in order
+to exercise specific bits of the automate stdio interface and the
+Monotone::AutomateStdio library. This branch must in no way ever be merged back
+to the main Monotone branch.
============================================================
--- script1cd89bae8485ee5a3532bb35c764ef43239098af8
+++ script1cd89bae8485ee5a3532bb35c764ef43239098af8
@@ -0,0 +1,3 @@
+#!/bin/sh
+ls -la
+exit 0
============================================================
--- script2cd89bae8485ee5a3532bb35c764ef43239098af8
+++ script2cd89bae8485ee5a3532bb35c764ef43239098af8
@@ -0,0 +1,3 @@
+#!/bin/sh
+ls -la
+exit 0
============================================================
# snowdonia.jpg is binary
============================================================
# snowdonia.xcf is binary
============================================================
--- COPYING06877624ea5c77efe3b7e39b0f909eda6e25a4ec
+++ COPYING7d7e3bd4448ca5450c1a211675734ed6a5eae18a
@@ -1,8 +1,8 @@
MOST_SOURCES = \
$(SANITY_CORE_SOURCES) $(LUAEXT_SOURCES) platform-wrapped.hh\
rev_types.hh mtn-sanity.cc mtn-sanity.hh ui.cc ui.hh\
============================================================
--- platform.hh7b09b4e28d7c7379e6336a3fa8d76cf937d3ac1f
+++ /dev/null
@@ -1,163 +0,0 @@
-#ifndef __PLATFORM_HH__
-#define __PLATFORM_HH__
-
-// Copyright (C) 2002 Graydon Hoare <graydon@pobox.com>
-//
-// This program is made available under the GNU GPL version 2.0 or
-// greater. See the accompanying file COPYING for details.
-//
-// This program is distributed WITHOUT ANY WARRANTY; without even the
-// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE.
-
-// this describes functions to be found, alternatively, in win32/* or unix/*
-// directories.
-
-
-#include <stdio.h>
-
-void read_password(std::string const & prompt, char * buf, size_t bufsz);
-void get_system_flavour(std::string & ident);
-bool is_executable(const char *path);
-
-// For LUA
-int existsonpath(const char *exe);
-int make_executable(const char *path);
-pid_t process_spawn(const char * const argv[]);
-pid_t process_spawn_redirected(char const * in,
- char const * out,
- char const * err,
- char const * const argv[]);
-pid_t process_spawn_pipe(char const * const argv[], FILE** in, FILE** out);
-int process_wait(pid_t pid, int *res, int timeout = -1);// default infinite
-int process_kill(pid_t pid, int signal);
-int process_sleep(unsigned int seconds);
-
-// stop "\n"->"\r\n" from breaking automate on Windows
-void make_io_binary();
-
-#ifdef WIN32
-std::string munge_argv_into_cmdline(const char* const argv[]);
-#endif
-// for term selection
-bool have_smart_terminal();
-// this function cannot call W/P/L, because it is called by the tick printing
-// code.
-// return value of 0 means "unlimited"
-unsigned int terminal_width();
-
-// for "reckless mode" workspace change detection.
-// returns 'true' if it has generated a valid inodeprint; returns 'false' if
-// there was a problem, in which case we should act as if the inodeprint has
-// changed.
-class inodeprint_calculator
-{
-public:
- template<typename T> void add_item(T obj)
- {
- size_t size(sizeof(obj));
- add_item(&size, sizeof(size));
- add_item(&obj, sizeof(obj));
- }
- // When adding a time to the print use these to note if it's
- // close to the current time (within about 3 seconds) or
- // in the future.
- // To make this more robust, there are some tricks:
- // -- we refuse to inodeprint files whose times are within a few seconds of
- // 'now'. This is because, we might memorize the inodeprint, then
- // someone writes to the file, and this write does not update the
- // timestamp -- or rather, it does update the timestamp, but nothing
- // happens, because the new value is the same as the old value. We use
- // "a few seconds" to make sure that it is larger than whatever the
- // filesystem's timekeeping granularity is (rounding to 2 seconds is
- // known to exist in the wild).
- // -- by the same reasoning, we should also refuse to inodeprint files whose
- // time is in the future, because it is possible that someone will write
- // to that file exactly when that future second arrives, and we will
- // never notice. However, this would create persistent and hard to
- // diagnosis slowdowns, whenever a tree accidentally had its times set
- // into the future. Therefore, to handle this case, we include a "is
- // this time in the future?" bit in the hashed information. This bit
- // will change when we pass the future point, and trigger a re-check of
- // the file's contents.
- //
- // This is, of course, still not perfect. There is no way to make our stat
- // atomic with the actual read of the file, so there's always a race condition
- // there. Additionally, this handling means that checkout will never actually
- // inodeprint anything, but rather the first command after checkout will be
- // slow. There doesn't seem to be anything that could be done about this.
- virtual void note_future(bool f = true) = 0;
- virtual void note_nowish(bool f = true) = 0;
- virtual ~inodeprint_calculator() {};
-protected:
- virtual void add_item(void *dat, size_t size) = 0;
-};
-bool inodeprint_file(std::string const & file, inodeprint_calculator & calc);
-
-// for netsync 'serve' pidfile support
-pid_t get_process_id();
-
-// netsync wants to ignore sigpipe; this is meaningless on Win32
-#ifdef WIN32
-inline void ignore_sigpipe() {}
-#else
-void ignore_sigpipe(); // in unix/process.cc
-#endif
-
-// filesystem stuff
-// FIXME: BUG: this returns a string in the filesystem charset/encoding
-std::string get_current_working_dir();
-// calls N() if fails
-void change_current_working_dir(std::string const & to);
-std::string tilde_expand(std::string const & path);
-std::string get_default_confdir();
-
-inline std::string get_default_keydir()
-{ return get_default_confdir() + "/keys"; }
-
-std::string get_homedir();
-namespace path
-{
- typedef enum { nonexistent, directory, file } status;
-};
-path::status get_path_status(std::string const & path);
-
-struct dirent_consumer
-{
- virtual ~dirent_consumer() {}
- virtual void consume(const char *) = 0;
-};
-void do_read_directory(std::string const & path,
- dirent_consumer & files,
- dirent_consumer & dirs,
- dirent_consumer & other_files);
-
-void rename_clobberingly(std::string const & from, std::string const & to);
-void do_remove(std::string const & path);
-
-void do_mkdir(std::string const & path);
-void write_data_worker(std::string const & p,
- std::string const & dat,
- std::string const & tmpdir,
- bool user_private);
-
-// strerror wrapper for OS-specific errors (e.g. use FormatMessage on Win32)
-std::string os_strerror(os_err_t errnum);
-
-// for running cpu benchmarks
-// Returns the processor time used by the current process, plus some
-// arbitrary constant, measured in seconds.
-double cpu_now();
-
-// determine directory to load locale data from
-std::string get_locale_dir();
-
-// Local Variables:
-// mode: C++
-// fill-column: 76
-// c-file-style: "gnu"
-// indent-tabs-mode: nil
-// End:
-// vim: et:sw=2:sts=2:ts=2:cino=>2s,{s,\:s,+s,t0,g0,^-2,e-2,n-2,p2s,(0,=s:
-
-#endif // __PLATFORM_HH__
============================================================
--- /dev/null
+++ README-FIRSTfa4a0466d6c105cf3984af5fe3416c3097452be5
@@ -0,0 +1,5 @@
+This is a test branch for the Monotone::AutomateStdio Perl library. This branch
+is branched off from Monotone version 0.41 and contains random changes in order
+to exercise specific bits of the automate stdio interface and the
+Monotone::AutomateStdio library. This branch must in no way ever be merged back
+to the main Monotone branch.
============================================================
--- /dev/null
+++ script1cd89bae8485ee5a3532bb35c764ef43239098af8
@@ -0,0 +1,3 @@
+#!/bin/sh
+ls -la
+exit 0
============================================================
--- /dev/null
+++ script2cd89bae8485ee5a3532bb35c764ef43239098af8
@@ -0,0 +1,3 @@
+#!/bin/sh
+ls -la
+exit 0
============================================================
# snowdonia.jpg is binary
============================================================
# snowdonia.xcf is binary
============================================================
--- /dev/null
+++ DO-NOT-USEda39a3ee5e6b4b0d3255bfef95601890afd80709
get_error_message() method returned `including missing parent '''
========== descendents ==========
$VAR1 = [
'05cb265ad778107218701fa76a91bdf4770b85a8',
'ef0223d004c4d8d6a71899d603b508a558437ea7',
'f06e40cb1d2b4f5c0db387e7a6c37681f1f89294'
];
get_error_message() method returned `including missing parent '''
========== drop_attribute ==========
Dropped attributes on contrib/dtrace2calltree.py and contrib/colorize
get_error_message() method returned `including missing parent '''
========== drop_db_variables ==========
Adding test variables.
TST-vars: greeting good day
Removing all TST-vars variables and test-vars:var1.
test-vars: var2 good bye
Removing all test-vars variables.
get_error_message() method returned `including missing parent '''
========== erase_ancestors ==========
$VAR1 = [
'05cb265ad778107218701fa76a91bdf4770b85a8',
'110816e646d42ca45e8205778255cece9c8f2159'
];
get_error_message() method returned `including missing parent '''
========== file_merge (on a mergeable conflict) ==========
AUTOMAKE_OPTIONS=subdir-objects 1.7.1
ACLOCAL_AMFLAGS = -I m4
sed -e 's,<head>,<head><link type="text/css" rel="stylesheet" href="texinfo.css" />,' $$f.bak >$$f; \
rm -f $$f.bak; \
done
get_error_message() method returned `including missing parent '''
========== file_merge (on an unmergeable conflict) ==========
====================
PROBLEM (2): misuse: internal line merger failed
at ../mtn-tester line 756
main::__ANON__(2, 'misuse: internal line merger failed', 'undef') called at /home/aecoope/code/monotone.ca/automate-stdio/lib/Monotone/AutomateStdio.pm line 5414
Monotone::AutomateStdio::warning_handler_wrapper('misuse: internal line merger failed') called at /home/aecoope/code/monotone.ca/automate-stdio/lib/Monotone/AutomateStdio.pm line 4389
Monotone::AutomateStdio::mtn_command_with_options('Monotone::AutomateStdio=HASH(0x9dbef8c)', 'file_merge', 1, 1, 'SCALAR(0x9bbc0c4)', 'ARRAY(0xa08de84)', '5fee1e9c463d3cd7439bea9c483d9d88d0b057d5', 'ui.cc', 'b9a5862a8ba577538f27c69656d8a6bb60ecb777', ...) called at /home/aecoope/code/monotone.ca/automate-stdio/lib/Monotone/AutomateStdio.pm line 4135
Monotone::AutomateStdio::mtn_command('Monotone::AutomateStdio=HASH(0x9dbef8c)', 'file_merge', 1, 1, 'SCALAR(0x9bbc0c4)', '5fee1e9c463d3cd7439bea9c483d9d88d0b057d5', 'ui.cc', 'b9a5862a8ba577538f27c69656d8a6bb60ecb777', 'ui.cc', ...) called at /home/aecoope/code/monotone.ca/automate-stdio/lib/Monotone/AutomateStdio.pm line 1127
Monotone::AutomateStdio::file_merge('Monotone::AutomateStdio=HASH(0x9dbef8c)', 'SCALAR(0x9bbc0c4)', '5fee1e9c463d3cd7439bea9c483d9d88d0b057d5', 'ui.cc', 'b9a5862a8ba577538f27c69656d8a6bb60ecb777', 'ui.cc') called at ../mtn-tester line 768
at ../mtn-tester line 795
main::__ANON__(2, 'misuse: internal line merger failed', 'undef') called at /home/aecoope/code/monotone.ca/automate-stdio/lib/Monotone/AutomateStdio.pm line 5554
Monotone::AutomateStdio::warning_handler_wrapper('misuse: internal line merger failed') called at /home/aecoope/code/monotone.ca/automate-stdio/lib/Monotone/AutomateStdio.pm line 4502
Monotone::AutomateStdio::mtn_command_with_options('Monotone::AutomateStdio=HASH(0x8911590)', 'file_merge', 1, 1, 'SCALAR(0x871139c)', 'ARRAY(0x8a92754)', '5fee1e9c463d3cd7439bea9c483d9d88d0b057d5', 'ui.cc', 'b9a5862a8ba577538f27c69656d8a6bb60ecb777', ...) called at /home/aecoope/code/monotone.ca/automate-stdio/lib/Monotone/AutomateStdio.pm line 4248
Monotone::AutomateStdio::mtn_command('Monotone::AutomateStdio=HASH(0x8911590)', 'file_merge', 1, 1, 'SCALAR(0x871139c)', '5fee1e9c463d3cd7439bea9c483d9d88d0b057d5', 'ui.cc', 'b9a5862a8ba577538f27c69656d8a6bb60ecb777', 'ui.cc', ...) called at /home/aecoope/code/monotone.ca/automate-stdio/lib/Monotone/AutomateStdio.pm line 1136
Monotone::AutomateStdio::file_merge('Monotone::AutomateStdio=HASH(0x8911590)', 'SCALAR(0x871139c)', '5fee1e9c463d3cd7439bea9c483d9d88d0b057d5', 'ui.cc', 'b9a5862a8ba577538f27c69656d8a6bb60ecb777', 'ui.cc') called at ../mtn-tester line 807
OOPS: misuse: internal line merger failed
get_error_message() method returned `misuse: internal line merger failed'
========== genkey ==========
$VAR1 = {
'hash' => '78c79bc28735632a9b7580fc5501de05ec8b9304',
'hash' => '15621a44f4a94a91c7e545082ed46eeac5ad6eda',
'public_location' => [
'database',
'keystore'
'keystore'
]
};
get_error_message() method returned `misuse: internal line merger failed'
========== get_attributes (on a file that has none) ==========
---------- Raw Data ----------
---------- Structured Data ----------
$VAR1 = [];
get_error_message() method returned `misuse: internal line merger failed'
========== get_attributes (on a file that now has none) ==========
---------- Raw Data ----------
attr "mtn:execute" "true"
'state' => 'dropped'
}
];
get_error_message() method returned `misuse: internal line merger failed'
========== get_attributes (on a file that has a few) ==========
---------- Raw Data ----------
attr "mtn:gimp-native-format" "true"
'state' => 'unchanged'
}
];
get_error_message() method returned `misuse: internal line merger failed'
========== get_base_revision_id ==========
Variable = `ee9d2b736adc24fb9a5926f68304814e93ee8726'
get_error_message() method returned `misuse: internal line merger failed'
========== get_content_changed ==========
$VAR1 = [
'7053bc5eec5dcee834e126ebd276ecbb37e9224b',
'db648027acbe37599c1be2c4f6d52d9a7d492864'
];
get_error_message() method returned `misuse: internal line merger failed'
========== get_corresponding_path ==========
Variable = `play.cc'
get_error_message() method returned `misuse: internal line merger failed'
========== get_current_revision (no options) ==========
mtn: dropping work.hh from workspace manifest
mtn: dropping unix/README from workspace manifest
'type' => 'clear'
}
];
get_error_message() method returned `misuse: internal line merger failed'
========== get_current_revision (file restriction) ==========
mtn: dropping work.hh from workspace manifest
mtn: dropping unix/README from workspace manifest
'type' => 'add_file'
}
];
get_error_message() method returned `including missing parent '''
========== get_current_revision (file restriction and depth option) ==========
mtn: dropping work.hh from workspace manifest
mtn: dropping unix/README from workspace manifest
'type' => 'add_file'
}
];
get_error_message() method returned `including missing parent '''
========== get_current_revision (exclude option) ==========
mtn: dropping work.hh from workspace manifest
mtn: dropping unix/README from workspace manifest
'type' => 'add_file'
}
];
get_error_message() method returned `including missing parent '''
========== get_current_revision (depth and exclude option) ==========
mtn: dropping work.hh from workspace manifest
mtn: dropping unix/README from workspace manifest
'type' => 'add_file'
}
];
get_error_message() method returned `including missing parent '''
========== get_current_revision_id ==========
Variable = `f9043efc147db34e12c6a6e5e46349f9e0ce742d'
get_error_message() method returned `including missing parent '''
========== get_db_name ==========
Database name = `<Workspace>'
get_error_message() method returned `including missing parent '''
========== get_db_variables ==========
Adding test variables.
TST-vars: greeting good day
}
];
Removing all test-vars and TST-vars variables.
get_error_message() method returned `including missing parent '''
========== get_file (fetching the COPYING file) ==========
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
free software license, such as the GNU General Public License, to
permit their use in free software.
get_error_message() method returned `including missing parent '''
========== get_file_of (fetching the INSTALL file) ==========
building and installation process for monotone
==============================================
perform some additional steps to migrate your data to the newest
version; see the file UPGRADE for details.
get_error_message() method returned `including missing parent '''
========== get_manifest_of ==========
---------- Raw Data ----------
format_version "1"
'attributes' => []
}
];
get_error_message() method returned `including missing parent '''
========== get_option (getting the branch option value) ==========
Variable = `net.venge.monotone.contrib.lib.automate-stdio.test'
get_error_message() method returned `including missing parent '''
========== get_pid ==========
MTN process id = `1257'
MTN process id = `19405'
get_error_message() method returned `including missing parent '''
========== get_revision ==========
---------- Raw Data ----------
format_version "1"
'type' => 'old_revision'
}
];
get_error_message() method returned `including missing parent '''
========== get_workspace_root ==========
Variable = `/home/aecoope/code/monotone.ca/automate-stdio/MTN-0.46'
Variable = `/home/aecoope/code/monotone.ca/automate-stdio/MTN-0.48'
get_error_message() method returned `including missing parent '''
========== graph ==========
---------- Raw Data ----------
0005a23e30a9c2d3024d94773eec433bf9acb770 5bdcfee44a3e2da5fb0e437d3623f2227ea2fed4 9e65e330c0d76769296452d68d0c52335edb5f1a
]
}
];
get_error_message() method returned `including missing parent '''
========== heads ==========
$VAR1 = [
'ee9d2b736adc24fb9a5926f68304814e93ee8726'
];
get_error_message() method returned `including missing parent '''
========== identify (file database.cc) ==========
Variable = `a66238a6b633d82f988003ae8c114bf19366b6a1'
get_error_message() method returned `including missing parent '''
========== inventory (no options) ==========
---------- Raw Data ----------
path ""
'birth_id' => '276264b0b3f1e70fc1835a700e6e61bdbe4c3f2f'
}
];
get_error_message() method returned `including missing parent '''
========== inventory (depth option) ==========
---------- Raw Data ----------
path ""
'birth_id' => '276264b0b3f1e70fc1835a700e6e61bdbe4c3f2f'
}
];
get_error_message() method returned `including missing parent '''
========== inventory (depth + exclude play.cc options) ==========
---------- Raw Data ----------
path ""
'birth_id' => '276264b0b3f1e70fc1835a700e6e61bdbe4c3f2f'
}
];
get_error_message() method returned `including missing parent '''
========== inventory (most options) ==========
---------- Raw Data ----------
path ""
'birth_id' => '276264b0b3f1e70fc1835a700e6e61bdbe4c3f2f'
}
];
get_error_message() method returned `including missing parent '''
========== inventory (all options generates nothing) ==========
---------- Raw Data ----------
---------- Structured Data ----------
$VAR1 = [];
get_error_message() method returned `including missing parent ''including missing parent '''
========== inventory (just changed unknown files) ==========
---------- Raw Data ----------
path "another-file"
'path' => 'log'
}
];
get_error_message() method returned `including missing parent ''including missing parent '''
========== inventory (restrict output to those files under unix) ==========
---------- Raw Data ----------
path ""
old_type "directory"
new_type "directory"
fs_type "directory"
birth [276264b0b3f1e70fc1835a700e6e61bdbe4c3f2f]
status "known"
path "unix"
old_type "directory"
new_type "directory"
'fs_type' => 'directory',
'old_type' => 'directory',
'new_type' => 'directory',
'path' => '',
'birth_id' => '276264b0b3f1e70fc1835a700e6e61bdbe4c3f2f'
},
{
'status' => [
'known'
],
'fs_type' => 'directory',
'old_type' => 'directory',
'new_type' => 'directory',
'path' => 'unix',
'birth_id' => '0e1591119ceda838787e000a74e7ed265d1a33e4'
},
'birth_id' => '919f3b4541b6edba7b8b45ef0cda717e5ea2d8b0'
}
];
get_error_message() method returned `including missing parent ''including missing parent '''
========== keys ==========
---------- Raw Data ----------
hash [001b3d7fe46175069970c725e5d91eb6ce5bc784]
local_name "graydon@pobox.com"
public_location "database"
hash [15621a44f4a94a91c7e545082ed46eeac5ad6eda]
given_name "pooh.bear_XxX_1234@test-id.com"
local_name "pooh.bear_XxX_1234@test-id.com"
public_location "database" "keystore"
private_location "keystore"
hash [1aaecf3a7c227e5545b0504aea5d3716d3128117]
given_name "me@thomaskeller.biz"
local_name "me@thomaskeller.biz"
local_name "christof.petig@arcor.de"
public_location "database"
hash [78c79bc28735632a9b7580fc5501de05ec8b9304]
given_name "pooh.bear_XxX_1234@test-id.com"
local_name "pooh.bear_XxX_1234@test-id.com"
public_location "database" "keystore"
private_location "keystore"
hash [7a9425a8910bc98b1671ceea937b8ee31e21d3eb]
given_name "anderse-monotone@cello.hpl.hp.com"
local_name "anderse-monotone@cello.hpl.hp.com"
'given_name' => 'graydon@pobox.com'
},
{
'hash' => '15621a44f4a94a91c7e545082ed46eeac5ad6eda',
'public_location' => [
'database',
'keystore'
],
'local_name' => 'pooh.bear_XxX_1234@test-id.com',
'private_location' => [
'keystore'
],
'given_name' => 'pooh.bear_XxX_1234@test-id.com'
},
{
'hash' => '1aaecf3a7c227e5545b0504aea5d3716d3128117',
'public_location' => [
'database'
'given_name' => 'christof.petig@arcor.de'
},
{
'hash' => '78c79bc28735632a9b7580fc5501de05ec8b9304',
'public_location' => [
'database',
'keystore'
],
'local_name' => 'pooh.bear_XxX_1234@test-id.com',
'private_location' => [
'keystore'
],
'given_name' => 'pooh.bear_XxX_1234@test-id.com'
},
{
'hash' => '7a9425a8910bc98b1671ceea937b8ee31e21d3eb',
'public_location' => [
'database'
'given_name' => 'kinetik@flim.org'
}
];
get_error_message() method returned `including missing parent ''including missing parent '''
========== leaves ==========
$VAR1 = [
'00b93c775f49d7164ee6cee751e37084da5fae59',
'fc349607d18f384b4b4d424b34d60bc99f417dbe',
'fe9a23fad30929b5b03569a7425e48672c2585cc'
];
get_error_message() method returned `including missing parent ''including missing parent '''
========== lua ==========
[1] = false;
get_error_message() method returned `including missing parent ''including missing parent '''
========== packet_for_fdata ==========
[fdata 8d87e9368e3f3ebd63df11e12610ac90ac2ee4e5]
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
[end]
get_error_message() method returned `including missing parent ''including missing parent '''
========== packet_for_fdelta ==========
[fdelta 0682f911f2598d229d218fd28cc5964534bd3c65
8d87e9368e3f3ebd63df11e12610ac90ac2ee4e5]
H4sIAAAAAAAA/x2NwQ6CMBiD7/9TVL1siSabA4QYvXDyKYiBIUtwS35ASQzv7qCHpoevbQmFxOiMHjgrOjhf91NjsR/56Yc28HugcgU0klSlkUoMEaJ+mwOuhXDNLOqJueLwPcJJ7G54dWEYZSzneaahLybGQpkUpijMuqPI+jo0tursHJNg+zndnfeWhRRSyut2sNBC9AfxUq0GpQAAAA==
[end]
get_error_message() method returned `including missing parent ''including missing parent '''
========== packet_for_rdata ==========
[rdata ec5d40149421cbd1b6984de0806d323f9e1e6e60]
H4sIAAAAAAAA/2WOW2rEMAwA/30KkwMU+SFbOssSgiXLNKVJlmzYXr+hv/2fGWYc59au5W3naz12P4XJud1+lq3t67DX5R+kIxkwaDIMSswtI2shAmzEtTKnbpbG7Nzx3ZfT3utf6lEBkyiaKXY1o5QtxGLSYy2mIqkax5jlFp/t0k8/Pc/jy/T6UJ2cH+ex+QcrUeilWtdoJQNigCA6CrZE0iA0ZDDR2Xnvr+MWbERMPEYexBiC1FCb5kwFOhRJQSsQYvy326VkgnjDYqkiswaxqHmUjrFzqz1zpJJn9wtxpSOHNAEAAA==
[end]
get_error_message() method returned `including missing parent ''including missing parent '''
========== packets_for_certs ==========
[rcert ec5d40149421cbd1b6984de0806d323f9e1e6e60
branch
VGhpcyBpcyBhIHRlc3QgYnJhbmNoIGZvciB0aGUgTW9ub3RvbmU6OkF1dG9tYXRlU3RkaW8gUGVybCBsaWJyYXJ5LiBQbGVhc2UgZG8Kbm90IHVzZS4K]
fuKsBRBvze9GbNJcg9zDpX1zxWzE3u30mFXqdmUMQVY7r2e0eAULa0wsBTTHR+C9MZ5j7RMElbSdNpkTaqr4roULg3tCw04mWwQceMt3Vpd2JXifpp2cPrGD6BFQtVw3AwQpSE8S2U2b6BxlN8xwMY2tnmwfYhmk9i6GFMHFnZI=
[end]
get_error_message() method returned `including missing parent ''including missing parent '''
========== parents ==========
7053bc5eec5dcee834e126ebd276ecbb37e9224b
db648027acbe37599c1be2c4f6d52d9a7d492864
get_error_message() method returned `including missing parent ''including missing parent '''
========== put_file ==========
Put test-put-file.txt, file id = e203d4ef09d404fa5c03cf6590e44231665be689
Put revision, revision id = 15f654b3568e451093fe4b16f04bbafe4a7f3812
mtn: [right] 8f9fefdb9507abe03dae2fc95a1c3fcd2c930868
mtn: adding test-put-file.txt
mtn: updated to base revision 8f9fefdb9507abe03dae2fc95a1c3fcd2c930868
-----------------------------------------------------------------
----------------------------------------------------------------------
Revision: 8f9fefdb9507abe03dae2fc95a1c3fcd2c930868
Ancestor: 15f654b3568e451093fe4b16f04bbafe4a7f3812
Author: aecooper@coosoft.plus.com
Date: 10/16/08 19:42:35
Branch: net.venge.monotone.contrib.lib.automate-stdio.test
Parent: 15f654b3568e451093fe4b16f04bbafe4a7f3812
Author: aecooper@coosoft.plus.com
Date: 10/16/08 19:42:35
Branch: net.venge.monotone.contrib.lib.automate-stdio.test
Modified files:
test-put-file.txt
Changelog:
ChangeLog:
Automated checkin #2.
-----------------------------------------------------------------
Changes against parent 15f654b3568e451093fe4b16f04bbafe4a7f3812
patched test-put-file.txt
----------------------------------------------------------------------
Revision: 15f654b3568e451093fe4b16f04bbafe4a7f3812
Ancestor: ee9d2b736adc24fb9a5926f68304814e93ee8726
Author: aecooper@coosoft.plus.com
Date: 10/16/08 19:42:30
Branch: net.venge.monotone.contrib.lib.automate-stdio.test
Parent: ee9d2b736adc24fb9a5926f68304814e93ee8726
Author: aecooper@coosoft.plus.com
Date: 10/16/08 19:42:30
Branch: net.venge.monotone.contrib.lib.automate-stdio.test
Added files:
test-put-file.txt
Changelog:
ChangeLog:
Automated checkin.
-----------------------------------------------------------------
Revision: ee9d2b736adc24fb9a5926f68304814e93ee8726
Ancestor: 5fee1e9c463d3cd7439bea9c483d9d88d0b057d5
Ancestor: b9a5862a8ba577538f27c69656d8a6bb60ecb777
Author: aecooper@coosoft.plus.com
Date: 01/05/09 16:57:47
Branch: net.venge.monotone.contrib.lib.automate-stdio.test
Modified files:
ui.cc
Changes against parent ee9d2b736adc24fb9a5926f68304814e93ee8726
ChangeLog:
added test-put-file.txt
----------------------------------------------------------------------
Revision: ee9d2b736adc24fb9a5926f68304814e93ee8726
Parent: 5fee1e9c463d3cd7439bea9c483d9d88d0b057d5
Parent: b9a5862a8ba577538f27c69656d8a6bb60ecb777
Author: aecooper@coosoft.plus.com
Date: 01/05/09 16:57:47
Branch: net.venge.monotone.contrib.lib.automate-stdio.test
Changelog:
merge of '5fee1e9c463d3cd7439bea9c483d9d88d0b057d5'
and 'b9a5862a8ba577538f27c69656d8a6bb60ecb777'
ChangeLog:
Changelog:
This is a test branch for the Monotone::AutomateStdio Perl library. Please do
not use.
-----------------------------------------------------------------
Changes against parent 5fee1e9c463d3cd7439bea9c483d9d88d0b057d5
no changes
Changes against parent b9a5862a8ba577538f27c69656d8a6bb60ecb777
patched ui.cc
----------------------------------------------------------------------
Revision: 5fee1e9c463d3cd7439bea9c483d9d88d0b057d5
Ancestor: a52a5d08f7e8b4052c23e80ea5e554125c5ee49c
Author: aecooper@coosoft.plus.com
Date: 01/05/09 16:56:02
Branch: net.venge.monotone.contrib.lib.automate-stdio.test
Parent: a52a5d08f7e8b4052c23e80ea5e554125c5ee49c
Author: aecooper@coosoft.plus.com
Date: 01/05/09 16:56:02
Branch: net.venge.monotone.contrib.lib.automate-stdio.test
Modified files:
ui.cc
Changelog:
ChangeLog:
Conflict 1.
Conflict 1.
Changes against parent a52a5d08f7e8b4052c23e80ea5e554125c5ee49c
-----------------------------------------------------------------
patched ui.cc
----------------------------------------------------------------------
Revision: b9a5862a8ba577538f27c69656d8a6bb60ecb777
Ancestor: a52a5d08f7e8b4052c23e80ea5e554125c5ee49c
Author: aecooper@coosoft.plus.com
Date: 01/05/09 16:55:45
Branch: net.venge.monotone.contrib.lib.automate-stdio.test
Parent: a52a5d08f7e8b4052c23e80ea5e554125c5ee49c
Author: aecooper@coosoft.plus.com
Date: 01/05/09 16:55:45
Branch: net.venge.monotone.contrib.lib.automate-stdio.test
Modified files:
ui.cc
Changelog:
ChangeLog:
Conflict 2.
Conflict 2.
Changes against parent a52a5d08f7e8b4052c23e80ea5e554125c5ee49c
patched ui.cc
get_error_message() method returned `including missing parent ''including missing parent '''
========== read_packets ==========
Added the piglet@aamilne.com key
9af372ca893b885a0388a540b0de3bd7b7db9bc9 patrick@georgi-clan.de
e5d7097b0d1064ee61732996fa6b79d4e23749b0 paul@ciphergoth.org
3005403ab8d3e3f20badb1aefb4e0a5f5f940648 piglet@aamilne.com
78c79bc28735632a9b7580fc5501de05ec8b9304 pooh.bear_XxX_1234@test-id.com
15621a44f4a94a91c7e545082ed46eeac5ad6eda pooh.bear_XxX_1234@test-id.com
d37d08fafaece16e9a79b4ea853326624e185cbd richard@levitte.org
bc80b5567c22e4de9adbe60e2b0ece6480d6367f ripley@lapo.it
8ad89008af9db804b7cc26045f9c0f4b1e059c7a rse@engelschall.com
[private keys]
7fe029d85af4de40700778b9784ef488fac2c79c aecooper@coosoft.plus.com
78c79bc28735632a9b7580fc5501de05ec8b9304 pooh.bear_XxX_1234@test-id.com
15621a44f4a94a91c7e545082ed46eeac5ad6eda pooh.bear_XxX_1234@test-id.com
get_error_message() method returned `including missing parent ''including missing parent '''
========== roots ==========
$VAR1 = [
'056ef6fca3deb45b0bbcc04b9844dd4955388f80',
'fa669d0e0f56316c1d9f5a6d2c4ab15ad8bc509d',
'fe4231352d7cabad1e8df6cea8d913771bbb7e66'
];
get_error_message() method returned `including missing parent ''including missing parent '''
========== select ==========
$VAR1 = [
'05cb265ad778107218701fa76a91bdf4770b85a8',
'ef0223d004c4d8d6a71899d603b508a558437ea7',
'f06e40cb1d2b4f5c0db387e7a6c37681f1f89294'
];
get_error_message() method returned `including missing parent ''including missing parent '''
========== set_attribute ==========
Added mtn:test-attr to file database.cc.
get_error_message() method returned `including missing parent ''including missing parent '''
========== show_conflicts ==========
---------- Raw Data ----------
left [26cfbb87b400321bda71277e1d2c0ba1d5e9898f]
'ancestor_name' => 'NEWS'
}
];
get_error_message() method returned `including missing parent ''including missing parent '''
========== show_conflicts (with internal merge resolution) ==========
---------- Raw Data ----------
left [05cb265ad778107218701fa76a91bdf4770b85a8]
'ancestor_name' => 'Makefile.am'
}
];
get_error_message() method returned `including missing parent ''including missing parent '''
========== tags (no branch restrictions) ==========
---------- Raw Data ----------
tag "0.5-release"
'tag' => 'viewmtn-0.10'
}
];
get_error_message() method returned `including missing parent ''including missing parent '''
========== tags (with branch restriction) ==========
---------- Raw Data ----------
tag "automate-stdio-duplicate-test-tag"
'tag' => 'automate-stdio-test-merge-point-1'
}
];
get_error_message() method returned `including missing parent ''including missing parent '''
========== toposort ==========
$VAR1 = [
'805c482bc9bb80cd393be7d3ba01a65377d91d9c',
'b8e6b77245cf29caa1f69bfb13749d785b13eac7',
'afd43cf2ce01fa4513fb1673eae47be3b48008f6'
];
get_error_message() method returned `including missing parent ''including missing parent '''
========== sync/pull/push ==========
----- Output of sync progress stream -----
114:p:35:setting default server to localhost114:p:45:setting default branch include pattern to '*'114:p:44:setting default branch exclude pattern to ''114:p:23:connecting to localhost114:p:172:first time connecting to server localhost
114:p:35:setting default server to localhost114:p:45:setting default branch include pattern to '*'114:p:44:setting default branch exclude pattern to ''114:p:61:setting default include pattern for server 'localhost' to '*'114:p:60:setting default exclude pattern for server 'localhost' to ''114:p:23:connecting to localhost114:p:172:first time connecting to server localhost
I'll assume it's really them, but you might want to double-check
their key's fingerprint: 7fe029d85af4de40700778b9784ef488fac2c79c114:p:29:finding items to synchronize:114:p:34:successful exchange with localhost114:l:1:0
----------
----- Output of push ticker stream -----
116:t:34:c:certificates;k:keys;r:revisions;116:t:12:c=0;k=0;r=0;116:t:13:c#0;k#0;r#64;116:t:14:c#0;k#0;r#128;116:t:14:c#0;k#0;r#192;116:t:14:c#0;k#0;r#256;116:t:14:c#0;k#0;r#320;116:t:14:c#0;k#0;r#384;116:t:14:c#0;k#0;r#448;116:t:14:c#0;k#0;r#512;116:t:14:c#0;k#0;r#576;116:t:14:c#0;k#0;r#640;116:t:14:c#0;k#0;r#704;116:t:14:c#0;k#0;r#768;116:t:14:c#0;k#0;r#832;116:t:14:c#0;k#0;r#896;116:t:14:c#0;k#0;r#960;116:t:15:c#0;k#0;r#1024;116:t:15:c#0;k#0;r#1088;116:t:15:c#0;k#0;r#1152;116:t:15:c#0;k#0;r#1216;116:t:15:c#0;k#0;r#1280;116:t:15:c#0;k#0;r#1344;116:t:15:c#0;k#0;r#1408;116:t:15:c#0;k#0;r#1472;116:t:15:c#0;k#0;r#1536;116:t:15:c#0;k#0;r#1600;116:t:15:c#0;k#0;r#1664;116:t:15:c#0;k#0;r#1728;116:t:15:c#0;k#0;r#1792;116:t:15:c#0;k#0;r#1856;116:t:15:c#0;k#0;r#1920;116:t:15:c#0;k#0;r#1984;116:t:15:c#0;k#0;r#2048;116:t:15:c#0;k#0;r#2112;116:t:15:c#0;k#0;r#2176;116:t:15:c#0;k#0;r#2240;116:t:15:c#0;k#0;r#2304;116:t:15:c#0;k#0;r#2368;116:t:15:c#0;k#0;r#2432;116:t:15:c#0;k#0;r#2496;116:t:15:c#0;k#0;r#2560;116:t:15:c#0;k#0;r#2624;116:t:15:c#0;k#0;r#2688;116:t:15:c#0;k#0;r#2752;116:t:15:c#0;k#0;r#2816;116:t:15:c#0;k#0;r#2880;116:t:15:c#0;k#0;r#2944;116:t:15:c#0;k#0;r#3008;116:t:15:c#0;k#0;r#3072;116:t:15:c#0;k#0;r#3136;116:t:15:c#0;k#0;r#3200;116:t:15:c#0;k#0;r#3264;116:t:15:c#0;k#0;r#3328;116:t:15:c#0;k#0;r#3392;116:t:15:c#0;k#0;r#3456;116:t:15:c#0;k#0;r#3520;116:t:15:c#0;k#0;r#3584;116:t:15:c#0;k#0;r#3648;116:t:15:c#0;k#0;r#3712;116:t:15:c#0;k#0;r#3776;116:t:15:c#0;k#0;r#3840;116:t:15:c#0;k#0;r#3904;116:t:15:c#0;k#0;r#3968;116:t:15:c#0;k#0;r#4032;116:t:15:c#0;k#0;r#4096;116:t:15:c#0;k#0;r#4160;116:t:15:c#0;k#0;r#4224;116:t:15:c#0;k#0;r#4288;116:t:15:c#0;k#0;r#4352;116:t:15:c#0;k#0;r#4416;116:t:15:c#0;k#0;r#4480;116:t:15:c#0;k#0;r#4544;116:t:15:c#0;k#0;r#4608;116:t:15:c#0;k#0;r#4672;116:t:15:c#0;k#0;r#4736;116:t:15:c#0;k#0;r#4800;116:t:15:c#0;k#0;r#4864;116:t:15:c#0;k#0;r#4928;116:t:15:c#0;k#0;r#4992;116:t:15:c#0;k#0;r#5056;116:t:15:c#0;k#0;r#5120;116:t:15:c#0;k#0;r#5184;116:t:15:c#0;k#0;r#5248;116:t:15:c#0;k#0;r#5312;116:t:15:c#0;k#0;r#5376;116:t:15:c#0;k#0;r#5440;116:t:15:c#0;k#0;r#5504;116:t:15:c#0;k#0;r#5568;116:t:15:c#0;k#0;r#5632;116:t:15:c#0;k#0;r#5696;116:t:15:c#0;k#0;r#5760;116:t:15:c#0;k#0;r#5824;116:t:15:c#0;k#0;r#5888;116:t:15:c#0;k#0;r#5952;116:t:15:c#0;k#0;r#6016;116:t:15:c#0;k#0;r#6080;116:t:15:c#0;k#0;r#6144;116:t:15:c#0;k#0;r#6208;116:t:15:c#0;k#0;r#6272;116:t:15:c#0;k#0;r#6336;116:t:15:c#0;k#0;r#6400;116:t:15:c#0;k#0;r#6464;116:t:15:c#0;k#0;r#6528;116:t:15:c#0;k#0;r#6592;116:t:15:c#0;k#0;r#6656;116:t:15:c#0;k#0;r#6720;116:t:15:c#0;k#0;r#6784;116:t:15:c#0;k#0;r#6848;116:t:15:c#0;k#0;r#6912;116:t:15:c#0;k#0;r#6976;116:t:15:c#0;k#0;r#7040;116:t:15:c#0;k#0;r#7104;116:t:15:c#0;k#0;r#7168;116:t:15:c#0;k#0;r#7232;116:t:15:c#0;k#0;r#7296;116:t:15:c#0;k#0;r#7360;116:t:15:c#0;k#0;r#7424;116:t:15:c#0;k#0;r#7488;116:t:15:c#0;k#0;r#7552;116:t:15:c#0;k#0;r#7616;116:t:15:c#0;k#0;r#7680;116:t:15:c#0;k#0;r#7744;116:t:15:c#0;k#0;r#7808;116:t:15:c#0;k#0;r#7872;116:t:15:c#0;k#0;r#7936;116:t:15:c#0;k#0;r#8000;116:t:15:c#0;k#0;r#8064;116:t:15:c#0;k#0;r#8128;116:t:15:c#0;k#0;r#8192;116:t:15:c#0;k#0;r#8256;116:t:15:c#0;k#0;r#8320;116:t:15:c#0;k#0;r#8384;116:t:15:c#0;k#0;r#8448;116:t:15:c#0;k#0;r#8512;116:t:15:c#0;k#0;r#8576;116:t:15:c#0;k#0;r#8640;116:t:15:c#0;k#0;r#8704;116:t:15:c#0;k#0;r#8768;116:t:15:c#0;k#0;r#8832;116:t:15:c#0;k#0;r#8896;116:t:15:c#0;k#0;r#8960;116:t:15:c#0;k#0;r#9024;116:t:15:c#0;k#0;r#9088;116:t:15:c#0;k#0;r#9152;116:t:15:c#0;k#0;r#9216;116:t:15:c#0;k#0;r#9280;116:t:15:c#0;k#0;r#9344;116:t:15:c#0;k#0;r#9408;116:t:15:c#0;k#0;r#9472;116:t:15:c#0;k#0;r#9536;116:t:15:c#0;k#0;r#9600;116:t:15:c#0;k#0;r#9664;116:t:15:c#0;k#0;r#9728;116:t:15:c#0;k#0;r#9792;116:t:15:c#0;k#0;r#9856;116:t:15:c#0;k#0;r#9920;116:t:15:c#0;k#0;r#9984;116:t:16:c#0;k#0;r#10048;116:t:16:c#0;k#0;r#10112;116:t:16:c#0;k#0;r#10176;116:t:16:c#0;k#0;r#10240;116:t:16:c#0;k#0;r#10304;116:t:16:c#0;k#0;r#10368;116:t:16:c#0;k#0;r#10432;116:t:16:c#0;k#0;r#10496;116:t:16:c#0;k#0;r#10560;116:t:16:c#0;k#0;r#10624;116:t:16:c#0;k#0;r#10688;116:t:16:c#0;k#0;r#10752;116:t:16:c#0;k#0;r#10816;116:t:16:c#0;k#0;r#10880;116:t:16:c#0;k#0;r#10944;116:t:16:c#0;k#0;r#11008;116:t:16:c#0;k#0;r#11072;116:t:16:c#0;k#0;r#11136;116:t:16:c#0;k#0;r#11200;116:t:16:c#0;k#0;r#11264;116:t:16:c#0;k#0;r#11328;116:t:16:c#0;k#0;r#11392;116:t:16:c#0;k#0;r#11456;116:t:16:c#0;k#0;r#11520;116:t:16:c#0;k#0;r#11584;116:t:16:c#0;k#0;r#11648;116:t:16:c#0;k#0;r#11712;116:t:16:c#0;k#0;r#11776;116:t:16:c#0;k#0;r#11840;116:t:16:c#0;k#0;r#11904;116:t:16:c#0;k#0;r#11968;116:t:16:c#0;k#0;r#12032;116:t:16:c#0;k#0;r#12096;116:t:16:c#0;k#0;r#12160;116:t:16:c#0;k#0;r#12224;116:t:16:c#0;k#0;r#12288;116:t:16:c#0;k#0;r#12352;116:t:16:c#0;k#0;r#12416;116:t:16:c#0;k#0;r#12480;116:t:16:c#0;k#0;r#12544;116:t:16:c#0;k#0;r#12608;116:t:16:c#0;k#0;r#12672;116:t:16:c#0;k#0;r#12736;116:t:16:c#0;k#0;r#12800;116:t:16:c#0;k#0;r#12864;116:t:16:c#0;k#0;r#12928;116:t:16:c#0;k#0;r#12992;116:t:16:c#0;k#0;r#13056;116:t:16:c#0;k#0;r#13120;116:t:16:c#0;k#0;r#13184;116:t:16:c#0;k#0;r#13248;116:t:16:c#0;k#0;r#13312;116:t:16:c#0;k#0;r#13376;116:t:16:c#0;k#0;r#13440;116:t:16:c#0;k#0;r#13504;116:t:16:c#0;k#0;r#13568;116:t:16:c#0;k#0;r#13632;116:t:16:c#0;k#0;r#13696;116:t:16:c#0;k#0;r#13760;116:t:16:c#0;k#0;r#13824;116:t:16:c#0;k#0;r#13888;116:t:16:c#0;k#0;r#13952;116:t:16:c#0;k#0;r#14016;116:t:16:c#0;k#0;r#14080;116:t:16:c#0;k#0;r#14144;116:t:16:c#0;k#0;r#14208;116:t:16:c#0;k#0;r#14272;116:t:16:c#0;k#0;r#14336;116:t:16:c#0;k#0;r#14400;116:t:16:c#0;k#0;r#14464;116:t:16:c#0;k#0;r#14528;116:t:16:c#0;k#0;r#14592;116:t:16:c#0;k#0;r#14656;116:t:16:c#0;k#0;r#14720;116:t:16:c#0;k#0;r#14784;116:t:16:c#0;k#0;r#14848;116:t:16:c#0;k#0;r#14912;116:t:16:c#0;k#0;r#14976;116:t:16:c#0;k#0;r#15040;116:t:18:c#256;k#0;r#15078;116:t:18:c#512;k#0;r#15078;116:t:18:c#768;k#0;r#15078;116:t:19:c#1024;k#0;r#15078;116:t:19:c#1280;k#0;r#15078;116:t:19:c#1536;k#0;r#15078;116:t:19:c#1792;k#0;r#15078;116:t:19:c#2048;k#0;r#15078;116:t:19:c#2304;k#0;r#15078;116:t:19:c#2560;k#0;r#15078;116:t:19:c#2816;k#0;r#15078;116:t:19:c#3072;k#0;r#15078;116:t:19:c#3328;k#0;r#15078;116:t:19:c#3584;k#0;r#15078;116:t:19:c#3840;k#0;r#15078;116:t:19:c#4096;k#0;r#15078;116:t:19:c#4352;k#0;r#15078;116:t:19:c#4608;k#0;r#15078;116:t:19:c#4864;k#0;r#15078;116:t:19:c#5120;k#0;r#15078;116:t:19:c#5376;k#0;r#15078;116:t:19:c#5632;k#0;r#15078;116:t:19:c#5888;k#0;r#15078;116:t:19:c#6144;k#0;r#15078;116:t:19:c#6400;k#0;r#15078;116:t:19:c#6656;k#0;r#15078;116:t:19:c#6912;k#0;r#15078;116:t:19:c#7168;k#0;r#15078;116:t:19:c#7424;k#0;r#15078;116:t:19:c#7680;k#0;r#15078;116:t:19:c#7936;k#0;r#15078;116:t:19:c#8192;k#0;r#15078;116:t:19:c#8448;k#0;r#15078;116:t:19:c#8704;k#0;r#15078;116:t:19:c#8960;k#0;r#15078;116:t:19:c#9216;k#0;r#15078;116:t:19:c#9472;k#0;r#15078;116:t:19:c#9728;k#0;r#15078;116:t:19:c#9984;k#0;r#15078;116:t:20:c#10240;k#0;r#15078;116:t:20:c#10496;k#0;r#15078;116:t:20:c#10752;k#0;r#15078;116:t:20:c#11008;k#0;r#15078;116:t:20:c#11264;k#0;r#15078;116:t:20:c#11520;k#0;r#15078;116:t:20:c#11776;k#0;r#15078;116:t:20:c#12032;k#0;r#15078;116:t:20:c#12288;k#0;r#15078;116:t:20:c#12544;k#0;r#15078;116:t:20:c#12800;k#0;r#15078;116:t:20:c#13056;k#0;r#15078;116:t:20:c#13312;k#0;r#15078;116:t:20:c#13568;k#0;r#15078;116:t:20:c#13824;k#0;r#15078;116:t:20:c#14080;k#0;r#15078;116:t:20:c#14336;k#0;r#15078;116:t:20:c#14592;k#0;r#15078;116:t:20:c#14848;k#0;r#15078;116:t:20:c#15104;k#0;r#15078;116:t:20:c#15360;k#0;r#15078;116:t:20:c#15616;k#0;r#15078;116:t:20:c#15872;k#0;r#15078;116:t:20:c#16128;k#0;r#15078;116:t:20:c#16384;k#0;r#15078;116:t:20:c#16640;k#0;r#15078;116:t:20:c#16896;k#0;r#15078;116:t:20:c#17152;k#0;r#15078;116:t:20:c#17408;k#0;r#15078;116:t:20:c#17664;k#0;r#15078;116:t:20:c#17920;k#0;r#15078;116:t:20:c#18176;k#0;r#15078;116:t:20:c#18432;k#0;r#15078;116:t:20:c#18688;k#0;r#15078;116:t:20:c#18944;k#0;r#15078;116:t:20:c#19200;k#0;r#15078;116:t:20:c#19456;k#0;r#15078;116:t:20:c#19712;k#0;r#15078;116:t:20:c#19968;k#0;r#15078;116:t:20:c#20224;k#0;r#15078;116:t:20:c#20480;k#0;r#15078;116:t:20:c#20736;k#0;r#15078;116:t:20:c#20992;k#0;r#15078;116:t:20:c#21248;k#0;r#15078;116:t:20:c#21504;k#0;r#15078;116:t:20:c#21760;k#0;r#15078;116:t:20:c#22016;k#0;r#15078;116:t:20:c#22272;k#0;r#15078;116:t:20:c#22528;k#0;r#15078;116:t:20:c#22784;k#0;r#15078;116:t:20:c#23040;k#0;r#15078;116:t:20:c#23296;k#0;r#15078;116:t:20:c#23552;k#0;r#15078;116:t:20:c#23808;k#0;r#15078;116:t:20:c#24064;k#0;r#15078;116:t:20:c#24320;k#0;r#15078;116:t:20:c#24576;k#0;r#15078;116:t:20:c#24832;k#0;r#15078;116:t:20:c#25088;k#0;r#15078;116:t:20:c#25344;k#0;r#15078;116:t:20:c#25600;k#0;r#15078;116:t:20:c#25856;k#0;r#15078;116:t:20:c#26112;k#0;r#15078;116:t:20:c#26368;k#0;r#15078;116:t:20:c#26624;k#0;r#15078;116:t:20:c#26880;k#0;r#15078;116:t:20:c#27136;k#0;r#15078;116:t:20:c#27392;k#0;r#15078;116:t:20:c#27648;k#0;r#15078;116:t:20:c#27904;k#0;r#15078;116:t:20:c#28160;k#0;r#15078;116:t:20:c#28416;k#0;r#15078;116:t:20:c#28672;k#0;r#15078;116:t:20:c#28928;k#0;r#15078;116:t:20:c#29184;k#0;r#15078;116:t:20:c#29440;k#0;r#15078;116:t:20:c#29696;k#0;r#15078;116:t:20:c#29952;k#0;r#15078;116:t:20:c#30208;k#0;r#15078;116:t:20:c#30464;k#0;r#15078;116:t:20:c#30720;k#0;r#15078;116:t:20:c#30976;k#0;r#15078;116:t:20:c#31232;k#0;r#15078;116:t:20:c#31488;k#0;r#15078;116:t:20:c#31744;k#0;r#15078;116:t:20:c#32000;k#0;r#15078;116:t:20:c#32256;k#0;r#15078;116:t:20:c#32512;k#0;r#15078;116:t:20:c#32768;k#0;r#15078;116:t:20:c#33024;k#0;r#15078;116:t:20:c#33280;k#0;r#15078;116:t:20:c#33536;k#0;r#15078;116:t:20:c#33792;k#0;r#15078;116:t:20:c#34048;k#0;r#15078;116:t:20:c#34304;k#0;r#15078;116:t:20:c#34560;k#0;r#15078;116:t:20:c#34816;k#0;r#15078;116:t:20:c#35072;k#0;r#15078;116:t:20:c#35328;k#0;r#15078;116:t:20:c#35584;k#0;r#15078;116:t:20:c#35840;k#0;r#15078;116:t:20:c#36096;k#0;r#15078;116:t:20:c#36352;k#0;r#15078;116:t:20:c#36608;k#0;r#15078;116:t:20:c#36864;k#0;r#15078;116:t:20:c#37120;k#0;r#15078;116:t:20:c#37376;k#0;r#15078;116:t:20:c#37632;k#0;r#15078;116:t:20:c#37888;k#0;r#15078;116:t:20:c#38144;k#0;r#15078;116:t:20:c#38400;k#0;r#15078;116:t:20:c#38656;k#0;r#15078;116:t:20:c#38912;k#0;r#15078;116:t:20:c#39168;k#0;r#15078;116:t:20:c#39424;k#0;r#15078;116:t:20:c#39680;k#0;r#15078;116:t:20:c#39936;k#0;r#15078;116:t:20:c#40192;k#0;r#15078;116:t:20:c#40448;k#0;r#15078;116:t:20:c#40704;k#0;r#15078;116:t:20:c#40960;k#0;r#15078;116:t:20:c#41216;k#0;r#15078;116:t:20:c#41472;k#0;r#15078;116:t:20:c#41728;k#0;r#15078;116:t:20:c#41984;k#0;r#15078;116:t:20:c#42240;k#0;r#15078;116:t:20:c#42496;k#0;r#15078;116:t:20:c#42752;k#0;r#15078;116:t:20:c#43008;k#0;r#15078;116:t:20:c#43264;k#0;r#15078;116:t:20:c#43520;k#0;r#15078;116:t:20:c#43776;k#0;r#15078;116:t:20:c#44032;k#0;r#15078;116:t:20:c#44288;k#0;r#15078;116:t:20:c#44544;k#0;r#15078;116:t:20:c#44800;k#0;r#15078;116:t:20:c#45056;k#0;r#15078;116:t:20:c#45312;k#0;r#15078;116:t:20:c#45568;k#0;r#15078;116:t:20:c#45791;k#1;r#15078;116:t:20:c#45791;k#2;r#15078;116:t:20:c#45791;k#3;r#15078;116:t:20:c#45791;k#4;r#15078;116:t:20:c#45791;k#5;r#15078;116:t:20:c#45791;k#6;r#15078;116:t:20:c#45791;k#7;r#15078;116:t:20:c#45791;k#8;r#15078;116:t:20:c#45791;k#9;r#15078;116:t:21:c#45791;k#10;r#15078;116:t:21:c#45791;k#11;r#15078;116:t:21:c#45791;k#12;r#15078;116:t:21:c#45791;k#13;r#15078;116:t:21:c#45791;k#14;r#15078;116:t:21:c#45791;k#15;r#15078;116:t:21:c#45791;k#16;r#15078;116:t:21:c#45791;k#17;r#15078;116:t:21:c#45791;k#18;r#15078;116:t:21:c#45791;k#19;r#15078;116:t:21:c#45791;k#20;r#15078;116:t:21:c#45791;k#21;r#15078;116:t:21:c#45791;k#22;r#15078;116:t:21:c#45791;k#23;r#15078;116:t:21:c#45791;k#24;r#15078;116:t:21:c#45791;k#25;r#15078;116:t:21:c#45791;k#26;r#15078;116:t:21:c#45791;k#27;r#15078;116:t:21:c#45791;k#28;r#15078;116:t:21:c#45791;k#29;r#15078;116:t:21:c#45791;k#30;r#15078;116:t:21:c#45791;k#31;r#15078;116:t:21:c#45791;k#32;r#15078;116:t:21:c#45791;k#33;r#15078;116:t:21:c#45791;k#34;r#15078;116:t:21:c#45791;k#35;r#15078;116:t:21:c#45791;k#36;r#15078;116:t:21:c#45791;k#37;r#15078;116:t:21:c#45791;k#38;r#15078;116:t:21:c#45791;k#39;r#15078;116:t:21:c#45791;k#40;r#15078;116:t:21:c#45791;k#41;r#15078;116:t:21:c#45791;k#42;r#15078;116:t:21:c#45791;k#43;r#15078;116:t:21:c#45791;k#44;r#15078;116:t:21:c#45791;k#45;r#15078;116:t:21:c#45791;k#46;r#15078;116:t:21:c#45791;k#47;r#15078;116:t:21:c#45791;k#48;r#15078;116:t:21:c#45791;k#49;r#15078;116:t:21:c#45791;k#50;r#15078;116:t:21:c#45791;k#51;r#15078;116:t:21:c#45791;k#52;r#15078;116:t:21:c#45791;k#53;r#15078;116:t:21:c#45791;k#54;r#15078;116:t:21:c#45791;k#55;r#15078;116:t:21:c#45791;k#56;r#15078;116:t:21:c#45791;k#57;r#15078;116:t:21:c#45791;k#58;r#15078;116:t:6:c;k;r;116:t:67:>:bytes in;<:bytes out;c:certs in;C:certs out;r:revs in;R:revs out;116:t:24:>=0;<=0;c=0;C=0;r=0;R=0;116:t:29:>#420;<#1097;c#0;C#0;r#0;R#0;116:t:30:>#1164;<#1866;c#0;C#0;r#0;R#0;116:t:30:>#1635;<#1964;c#0;C#0;r#0;R#0;116:t:12:<;>;C;R;c;r;116:l:1:0
----------
get_error_message() method returned `including missing parent ''including missing parent '''
========== remote connections (getting a branch listing) ==========
net.venge.monotone
net.venge.monotone-viz
net.venge.monotone.workspace-merge.api
net.venge.monotone.workspace-merge.conflict1
net.venge.monotone.ws_automate
Last error message `misuse: internal line merger failed'
get_error_message() method returned `including missing parent ''including missing parent '''
Last error message `including missing parent ''including missing parent '''
$VAR1 = \bless( {
'Monotone::AutomateStdio' => 138345382
'Monotone::AutomateStdio' => 1550076498
}, 'Monotone::AutomateStdio' );
Destroying object.

Archive Download the corresponding diff file

Branches

Tags

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status