#
# patch "ChangeLog"
# from [7cbbaf6aebf4eebe744025df83b081791e6fc989]
# to [e920a6097f965518207ec0564fb46e558816be45]
#
# patch "Makefile.am"
# from [aa59fd43d68778699352e7fe93eecb95a6b62de2]
# to [1ace8e4181f96a79a445af69c56a1a0c963f27fc]
#
# patch "NEWS"
# from [6f9664b26b7b3f764663afdee7ef692cc16c1f1c]
# to [c0c76558a121b91e95c1e2473053d65b13fa261e]
#
# patch "configure.ac"
# from [43ad5babd29ff6f85cb76f7bfbf16b1c0a9e19e9]
# to [22b889144948265a44054ed96ba229b8fcd81f11]
#
# patch "po/monotone.pot"
# from [6e55d1fd62c03115040d73812777878255a38424]
# to [10e6d7cbad87eaa0dbe35c803cafa371567f024b]
#
# patch "testsuite.at"
# from [2bdc42e2de266df08209e216afe489f69de95fa1]
# to [e4be4762f1bc61666fa434cba78e419c3fbdc4bb]
#
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,14 @@
2005-05-02 Nathaniel Smith
+ * configure.ac: Bump version to 0.19.
+ * NEWS: Tweaks.
+ * Makefile.am (MOST_SOURCES): Add options.hh.
+ (%.eps): Fix ps2eps calling convention.
+ * po/monotone.pot: Regenerate.
+ * testsuite.at (CHECK_SAME_CANONICALISED_STDOUT): New macro.
+
+2005-05-02 Nathaniel Smith
+
* NEWS: More updates.
* rcs_import.cc (store_manifest_edge): Fix some edge cases.
* tests/t_cvsimport_manifest_cycle.at: Make work. Un-XFAIL.
--- Makefile.am
+++ Makefile.am
@@ -45,7 +45,7 @@
cycle_detector.hh randomfile.hh adler32.hh quick_alloc.hh \
netio.hh smap.hh gettext.h \
package_revision.c package_revision.h \
- package_full_revision.c package_full_revision.h
+ package_full_revision.c package_full_revision.h options.hh
NETXX_SOURCES = \
netxx/accept.cxx netxx/accept.h netxx/address.cxx \
@@ -303,7 +303,7 @@
# ps2epsi $< $@
%.eps : %.ps
- ps2eps $< $@
+ ps2eps <$< >$@
$(top_builddir)/figures/%.ps: $(srcdir)/figures/%.pdf
mkdir -p $(top_builddir)/figures
--- NEWS
+++ NEWS
@@ -56,7 +56,7 @@
- windows/unix working copy line ending conversion now
works correctly. Thanks to Emile Snyder
.
- - many fixes to locale-specific filename support
+ - many fixes to i18n-ized filename support
- "drop" and "rename" now affect file attributes as
well. Thanks to Richard Levitte
and Joel Reed
--- configure.ac
+++ configure.ac
@@ -1,8 +1,8 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.58)
-AC_INIT(monotone, 0.18, address@hidden)
+AC_INIT(monotone, 0.19, address@hidden)
AM_INIT_AUTOMAKE(1.7.1)
AC_CONFIG_SRCDIR([app_state.cc])
AC_CONFIG_TESTDIR([tests])
--- po/monotone.pot
+++ po/monotone.pot
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-04-10 16:36-0700\n"
+"POT-Creation-Date: 2005-05-02 18:36-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -31,115 +31,110 @@
msgid "cannot change to directory to %s\n"
msgstr ""
-#: app_state.cc:69
+#: app_state.cc:65
#, c-format
+msgid "branch name is '%s'\n"
+msgstr ""
+
+#: app_state.cc:71
+#, c-format
msgid "relative directory is '%s'\n"
msgstr ""
-#: app_state.cc:76
+#: app_state.cc:78
#, c-format
msgid "setting dump path to %s\n"
msgstr ""
-#: app_state.cc:86
+#: app_state.cc:88
msgid "working copy directory required but not found"
msgstr ""
-#: app_state.cc:93
+#: app_state.cc:95
msgid "invalid directory ''"
msgstr ""
-#: app_state.cc:97
+#: app_state.cc:99
#, c-format
msgid "cannot change to initial directory %s\n"
msgstr ""
-#: app_state.cc:101
+#: app_state.cc:103
#, c-format
msgid "create working copy in %s\n"
msgstr ""
-#: app_state.cc:112
+#: app_state.cc:114
#, c-format
msgid "could not create directory: %s: %s\n"
msgstr ""
-#: app_state.cc:117
+#: app_state.cc:119
#, c-format
msgid "cannot change to new directory %s\n"
msgstr ""
-#: app_state.cc:126
+#: app_state.cc:128
#, c-format
msgid "monotone book-keeping directory '%s' already exists in '%s'\n"
msgstr ""
-#: app_state.cc:129
+#: app_state.cc:131
#, c-format
msgid "creating book-keeping directory '%s' for working copy in '%s'\n"
msgstr ""
-#: app_state.cc:146
+#: app_state.cc:153
#, c-format
msgid "'%s' prefixed to '%s'\n"
msgstr ""
-#: app_state.cc:163
+#: app_state.cc:170
#, c-format
msgid "'%s' ignored by restricted path set\n"
msgstr ""
-#: app_state.cc:168
+#: app_state.cc:175
#, c-format
msgid "unknown path '%s'\n"
msgstr ""
-#: app_state.cc:170
+#: app_state.cc:177
#, c-format
msgid "'%s' added to restricted path set\n"
msgstr ""
-#: app_state.cc:183
+#: app_state.cc:207
#, c-format
-msgid "empty restricted path set; '%s' included\n"
-msgstr ""
-
-#: app_state.cc:194
-#, c-format
-msgid "restricted path set cleared; '%s' included\n"
-msgstr ""
-
-#: app_state.cc:202
-#, c-format
msgid "checking restricted path set for '%s'\n"
msgstr ""
-#: app_state.cc:209
+#: app_state.cc:214
#, c-format
msgid "path '%s' found in restricted path set; '%s' included\n"
msgstr ""
-#: app_state.cc:215
+#: app_state.cc:220
#, c-format
msgid "path '%s' not found in restricted path set; '%s' excluded\n"
msgstr ""
-#: app_state.cc:255
+#: app_state.cc:264
#, c-format
msgid "search root '%s' does not exist\n"
msgstr ""
-#: app_state.cc:257
+#: app_state.cc:266
#, c-format
msgid "search root '%s' is not a directory\n"
msgstr ""
-#: app_state.cc:258
+#: app_state.cc:267
#, c-format
msgid "set search root to %s\n"
msgstr ""
-#: app_state.cc:271
+#: app_state.cc:292
msgid "negative or zero depth not allowed\n"
msgstr ""
@@ -227,1048 +222,995 @@
"multiple branch certs found for revision %s, please provide a branch name"
msgstr ""
-#: cert.cc:503 rcs_import.cc:1257 revision.cc:1549 revision.cc:1581
+#: cert.cc:504 rcs_import.cc:1315 revision.cc:1554 revision.cc:1586
msgid "no unique private key for cert construction"
msgstr ""
-#: cert.cc:618
+#: cert.cc:619
#, c-format
msgid "no default author name for branch '%s'"
msgstr ""
-#: change_set.cc:736
-#, c-format
-msgid "skipping preserved %s %d : '%s'\n"
-msgstr ""
-
-#: change_set.cc:742
-#, c-format
-msgid "analyzing %s %d : '%s' -> '%s'\n"
-msgstr ""
-
-#: change_set.cc:1453
+#: change_set.cc:1496
msgid "concatenating change sets\n"
msgstr ""
-#: change_set.cc:1476
+#: change_set.cc:1519
#, c-format
msgid "concatenating %d and %d deltas\n"
msgstr ""
-#: change_set.cc:1486
+#: change_set.cc:1529
#, c-format
msgid "processing delta on %s\n"
msgstr ""
-#: change_set.cc:1490
+#: change_set.cc:1533
#, c-format
msgid "delta on %s in first changeset renamed to %s\n"
msgstr ""
-#: change_set.cc:1495
+#: change_set.cc:1538
#, c-format
msgid "discarding delta [%s]->[%s] for deleted file '%s'\n"
msgstr ""
-#: change_set.cc:1513
+#: change_set.cc:1556
#, c-format
msgid "fusing deltas on %s : %s -> %s and %s -> %s\n"
msgstr ""
-#: change_set.cc:1527
+#: change_set.cc:1570
#, c-format
msgid "delta on %s in second changeset copied forward\n"
msgstr ""
-#: change_set.cc:1541
+#: change_set.cc:1584
msgid "finished concatenation\n"
msgstr ""
-#: change_set.cc:1647 change_set.cc:1654
+#: change_set.cc:1690 change_set.cc:1697
#, c-format
msgid "delete of %s dominates rename to %s\n"
msgstr ""
-#: change_set.cc:1664
+#: change_set.cc:1707
#, c-format
msgid "unable to resolve file conflict '%s' -> '%s' vs. '%s'"
msgstr ""
-#: change_set.cc:1668
+#: change_set.cc:1711
#, c-format
msgid "unable to resolve dir conflict '%s' -> '%s' vs. '%s'"
msgstr ""
-#: change_set.cc:1673
+#: change_set.cc:1716
#, c-format
msgid "illegal conflict resolution '%s', wanted '%s' or '%s'\n"
msgstr ""
-#: change_set.cc:1729
+#: change_set.cc:1772
#, c-format
msgid "tid %d (%s) clobbered tid %d (%s)\n"
msgstr ""
-#: change_set.cc:1765
+#: change_set.cc:1808
#, c-format
msgid "skipping common change on %s (tid %d)\n"
msgstr ""
-#: change_set.cc:1770
+#: change_set.cc:1813
#, c-format
msgid "skipping neutral change of %s -> %s (tid %d)\n"
msgstr ""
-#: change_set.cc:1777
+#: change_set.cc:1820
#, c-format
msgid "propagating change on %s -> %s (tid %d)\n"
msgstr ""
-#: change_set.cc:1793
+#: change_set.cc:1836
msgid "conflict detected, resolved in A's favour\n"
msgstr ""
-#: change_set.cc:1799
+#: change_set.cc:1842
msgid "conflict detected, resolved in B's favour\n"
msgstr ""
-#: change_set.cc:1965
+#: change_set.cc:2008
#, c-format
msgid "reusing merge resolution '%s' : '%s' -> '%s'\n"
msgstr ""
-#: change_set.cc:1974
+#: change_set.cc:2017
#, c-format
msgid "merge of '%s' : '%s' vs. '%s' (no common ancestor) failed"
msgstr ""
-#: change_set.cc:1981
+#: change_set.cc:2024
#, c-format
msgid "merge of '%s' : '%s' -> '%s' vs '%s' failed"
msgstr ""
-#: change_set.cc:1985
+#: change_set.cc:2028
#, c-format
msgid "merge of '%s' : '%s' -> '%s' vs '%s' resolved to '%s'\n"
msgstr ""
-#: change_set.cc:2042
+#: change_set.cc:2085
#, c-format
msgid "merge is copying delta '%s' : '%s' -> '%s'\n"
msgstr ""
-#: change_set.cc:2048
+#: change_set.cc:2091
#, c-format
msgid "skipping delta '%s'->'%s' on deleted file '%s'\n"
msgstr ""
-#: change_set.cc:2072
+#: change_set.cc:2115
#, c-format
msgid "propagating new file addition delta on '%s' : '%s' -> '%s'\n"
msgstr ""
-#: change_set.cc:2084
+#: change_set.cc:2127
#, c-format
msgid "skipping new file addition delta on '%s' : '' -> '%s'\n"
msgstr ""
-#: change_set.cc:2092
+#: change_set.cc:2135
#, c-format
msgid "skipping common delta '%s' : '%s' -> '%s'\n"
msgstr ""
-#: change_set.cc:2098
+#: change_set.cc:2141
#, c-format
msgid "skipping neutral delta on '%s' : %s -> %s\n"
msgstr ""
-#: change_set.cc:2106
+#: change_set.cc:2149
#, c-format
msgid "propagating unperturbed delta on '%s' : '%s' -> '%s'\n"
msgstr ""
-#: change_set.cc:2116
+#: change_set.cc:2159
#, c-format
msgid "merging delta '%s' : '%s' -> '%s' vs. '%s'\n"
msgstr ""
-#: change_set.cc:2129
+#: change_set.cc:2172
#, c-format
msgid "resolved merge to '%s' : '%s' -> '%s'\n"
msgstr ""
-#: change_set.cc:2154
+#: change_set.cc:2197
msgid "merging change sets\n"
msgstr ""
-#: change_set.cc:2210
+#: change_set.cc:2253
msgid "finished merge\n"
msgstr ""
-#: change_set.cc:2226
+#: change_set.cc:2269
msgid "inverting change set\n"
msgstr ""
-#: change_set.cc:2254
+#: change_set.cc:2299
#, c-format
msgid "converted 'delete %s' to 'add as %s' in inverse\n"
msgstr ""
-#: change_set.cc:2263
+#: change_set.cc:2308
#, c-format
msgid "converted add %s to delete in inverse\n"
msgstr ""
-#: change_set.cc:2273
+#: change_set.cc:2318
#, c-format
msgid "converting delta %s -> %s on %s\n"
msgstr ""
-#: change_set.cc:2275
+#: change_set.cc:2320
#, c-format
msgid "inverse is delta %s -> %s on %s\n"
msgstr ""
-#: change_set.cc:2333
+#: change_set.cc:2382
#, c-format
msgid "moving %s -> %s\n"
msgstr ""
-#: change_set.cc:2382
+#: change_set.cc:2431
#, c-format
msgid "moving file %s -> %s\n"
msgstr ""
-#: change_set.cc:2390
+#: change_set.cc:2439
#, c-format
msgid "moving dir %s -> %s\n"
msgstr ""
-#: change_set.cc:2831
+#: change_set.cc:2909
#, c-format
msgid "[begin changeset %s]\n"
msgstr ""
-#: change_set.cc:2832
+#: change_set.cc:2914
#, c-format
msgid "%s"
msgstr ""
-#: change_set.cc:2833
+#: change_set.cc:2915
#, c-format
msgid "[end changeset %s]\n"
msgstr ""
-#: change_set.cc:2865
+#: change_set.cc:2947
msgid "beginning disjoint_merge_test\n"
msgstr ""
-#: change_set.cc:2883
+#: change_set.cc:2965
msgid "finished disjoint_merge_test\n"
msgstr ""
-#: change_set.cc:2955 change_set.cc:3000 change_set.cc:3045
+#: change_set.cc:3037 change_set.cc:3122 change_set.cc:3167
#, c-format
msgid "informative failure: %s\n"
msgstr ""
-#: change_set.cc:2959 change_set.cc:3004 change_set.cc:3049
+#: change_set.cc:3041 change_set.cc:3126 change_set.cc:3171
#, c-format
msgid "runtime error: %s\n"
msgstr ""
-#: change_set.cc:3069
+#: change_set.cc:3048
+msgid "STARTING invert_change_test\n"
+msgstr ""
+
+#: change_set.cc:3082
+msgid "ENDING invert_change_test\n"
+msgstr ""
+
+#: change_set.cc:3191
#, c-format
msgid "%s:%d"
msgstr ""
-#: change_set.cc:3071
+#: change_set.cc:3193
#, c-format
msgid "BEGINNING concatenation test %s\n"
msgstr ""
-#: change_set.cc:3076
+#: change_set.cc:3198
#, c-format
msgid "FINISHING concatenation test %s\n"
msgstr ""
-#: change_set.cc:3131
+#: change_set.cc:3253
#, c-format
msgid "RUNNING bad_concatenate_change_test %s\n"
msgstr ""
-#: change_set.cc:3139
+#: change_set.cc:3261
msgid "skipping change_set printing, one or both are not sane\n"
msgstr ""
-#: change_set.cc:3144
+#: change_set.cc:3266
msgid "concat change_set is insane\n"
msgstr ""
-#: change_set.cc:3147
+#: change_set.cc:3269
msgid "Checking combined change set\n"
msgstr ""
-#: change_set.cc:3154
+#: change_set.cc:3276
msgid "combined_concat is insane\n"
msgstr ""
-#: change_set.cc:3160
+#: change_set.cc:3282
#, c-format
msgid "RUNNING bad_concatenate_change_test %s again backwards\n"
msgstr ""
-#: commands.cc:107
+#: commands.cc:131
#, c-format
msgid "expanding command '%s'\n"
msgstr ""
-#: commands.cc:124
+#: commands.cc:148
#, c-format
msgid "expanded command to '%s'\n"
msgstr ""
-#: commands.cc:129
+#: commands.cc:153
#, c-format
msgid "command '%s' has multiple ambiguous expansions: \n"
msgstr ""
-#: commands.cc:212
+#: commands.cc:232
#, c-format
msgid "executing %s command\n"
msgstr ""
-#: commands.cc:218
+#: commands.cc:238
#, c-format
msgid "unknown command '%s'\n"
msgstr ""
-#: commands.cc:245
-#, c-format
-msgid "work path is %s\n"
-msgstr ""
-
-#: commands.cc:252
-#, c-format
-msgid "revision path is %s\n"
-msgstr ""
-
-#: commands.cc:263
-#, c-format
-msgid "working copy is corrupt: %s does not exist\n"
-msgstr ""
-
-#: commands.cc:266
-#, c-format
-msgid "loading revision id from %s\n"
-msgstr ""
-
-#: commands.cc:276
-#, c-format
-msgid "writing revision id to %s\n"
-msgstr ""
-
-#: commands.cc:288
-#, c-format
-msgid "checking for un-committed work file %s\n"
-msgstr ""
-
-#: commands.cc:292
-#, c-format
-msgid "read rearrangement from %s\n"
-msgstr ""
-
-#: commands.cc:296
-#, c-format
-msgid "no un-committed work file %s\n"
-msgstr ""
-
-#: commands.cc:403
-#, c-format
-msgid "restriction includes %s %s\n"
-msgstr ""
-
-#: commands.cc:408
-#, c-format
-msgid "restriction excludes %s %s\n"
-msgstr ""
-
-#: commands.cc:427
-#, c-format
-msgid "restriction includes %s '%s' to '%s'\n"
-msgstr ""
-
-#: commands.cc:432
-#, c-format
-msgid "restriction excludes %s '%s' to '%s'\n"
-msgstr ""
-
-#: commands.cc:468
-#, c-format
-msgid "restriction includes delta on %s\n"
-msgstr ""
-
-#: commands.cc:473
-#, c-format
-msgid "restriction excludes delta on %s\n"
-msgstr ""
-
-#: commands.cc:509
-#, c-format
-msgid "base revision %s does not exist in database\n"
-msgstr ""
-
-#: commands.cc:512
-#, c-format
-msgid "old manifest is %s\n"
-msgstr ""
-
-#: commands.cc:515
-#, c-format
-msgid "base manifest %s does not exist in database\n"
-msgstr ""
-
-#: commands.cc:520
-#, c-format
-msgid "old manifest has %d entries\n"
-msgstr ""
-
-#: commands.cc:574
-#, c-format
-msgid "new manifest is %s\n"
-msgstr ""
-
-#: commands.cc:673
+#: commands.cc:330
msgid "edit of log message failed"
msgstr ""
-#: commands.cc:720
+#: commands.cc:338
#, c-format
-msgid "decoding selector '%s'\n"
+msgid ""
+"note: branch '%s' has multiple heads\n"
+"note: perhaps consider 'monotone merge'"
msgstr ""
-#: commands.cc:727
+#: commands.cc:399
#, c-format
-msgid "expansion of selector '%s' failed\n"
-msgstr ""
-
-#: commands.cc:731
-#, c-format
-msgid "expanded selector '%s' -> '%s'\n"
-msgstr ""
-
-#: commands.cc:756
-#, c-format
-msgid "unknown selector type: %c\n"
-msgstr ""
-
-#: commands.cc:807
-#, c-format
msgid "expanding selection '%s'\n"
msgstr ""
-#: commands.cc:815
+#: commands.cc:407
#, c-format
msgid "no match for selection '%s'"
msgstr ""
-#: commands.cc:818
+#: commands.cc:410
#, c-format
msgid "selection '%s' has multiple ambiguous expansions: \n"
msgstr ""
-#: commands.cc:825 commands.cc:854 commands.cc:883
+#: commands.cc:417 commands.cc:446 commands.cc:475
#, c-format
msgid "expanded to '%s'\n"
msgstr ""
-#: commands.cc:834 commands.cc:863
+#: commands.cc:426 commands.cc:455
msgid "non-hex digits in id"
msgstr ""
-#: commands.cc:843 commands.cc:872
+#: commands.cc:435 commands.cc:464
#, c-format
msgid "partial id '%s' does not have a unique expansion"
msgstr ""
-#: commands.cc:846 commands.cc:875
+#: commands.cc:438 commands.cc:467
#, c-format
msgid "partial id '%s' has multiple ambiguous expansions: \n"
msgstr ""
-#: commands.cc:853 commands.cc:882
+#: commands.cc:445 commands.cc:474
#, c-format
msgid "expanding partial id '%s'\n"
msgstr ""
-#: commands.cc:909
+#: commands.cc:501
#, c-format
msgid "warning: no public key '%s' found in database\n"
msgstr ""
-#: commands.cc:1018
+#: commands.cc:610
msgid "no keys found\n"
msgstr ""
-#: commands.cc:1020
+#: commands.cc:612
#, c-format
msgid "no keys found matching '%s'\n"
msgstr ""
-#: commands.cc:1156
+#: commands.cc:624 commands.cc:1354 commands.cc:1402 commands.cc:2821
#, c-format
+msgid "no revision %s found in database"
+msgstr ""
+
+#: commands.cc:630
+#, c-format
+msgid "revision %s already has children. We cannot kill it."
+msgstr ""
+
+#: commands.cc:767
+#, c-format
msgid "key '%s' already exists in database"
msgstr ""
-#: commands.cc:1160
+#: commands.cc:771
#, c-format
msgid "generating key-pair '%s'\n"
msgstr ""
-#: commands.cc:1162
+#: commands.cc:773
#, c-format
msgid "storing key-pair '%s' in database\n"
msgstr ""
-#: commands.cc:1179
+#: commands.cc:790
#, c-format
msgid "dropping public key '%s' from database\n"
msgstr ""
-#: commands.cc:1186
+#: commands.cc:797
#, c-format
-msgid "dropping private key '%s' from database\n"
+msgid ""
+"dropping private key '%s' from database\n"
+"\n"
msgstr ""
-#: commands.cc:1192
+#: commands.cc:798
+msgid "the private key data may not have been erased from the"
+msgstr ""
+
+#: commands.cc:799
+msgid "database. it is recommended that you use 'db dump' and"
+msgstr ""
+
+#: commands.cc:800
+msgid "'db load' to be sure."
+msgstr ""
+
+#: commands.cc:806
#, c-format
msgid "public or private key '%s' does not exist in database"
msgstr ""
-#: commands.cc:1207
+#: commands.cc:822
#, c-format
msgid "key '%s' does not exist in database"
msgstr ""
-#: commands.cc:1214
+#: commands.cc:829
msgid "passphrase changed\n"
msgstr ""
-#: commands.cc:1240
+#: commands.cc:855
msgid "no unique private key found, and no key specified"
msgstr ""
-#: commands.cc:1334
+#: commands.cc:949
msgid "need --branch argument for approval"
msgstr ""
-#: commands.cc:1352
+#: commands.cc:968
#, c-format
msgid "revision %s has %d changesets, cannot invert\n"
msgstr ""
-#: commands.cc:1357
+#: commands.cc:972
msgid "need --branch argument for disapproval"
msgstr ""
-#: commands.cc:1380
+#: commands.cc:995
#, c-format
msgid "disapproval of revision %s"
msgstr ""
-#: commands.cc:1396
+#: commands.cc:1011
msgid "edit comment failed"
msgstr ""
-#: commands.cc:1399
+#: commands.cc:1014
msgid "empty comment"
msgstr ""
-#: commands.cc:1514
+#: commands.cc:1129
#, c-format
msgid "cannot find file %s revision %s"
msgstr ""
-#: commands.cc:1557 commands.cc:2585
+#: commands.cc:1170 commands.cc:2246
msgid "empty log message"
msgstr ""
-#: commands.cc:1595
+#: commands.cc:1205
msgid "ancestor file id does not exist"
msgstr ""
-#: commands.cc:1598
+#: commands.cc:1208
msgid "left file id does not exist"
msgstr ""
-#: commands.cc:1601
+#: commands.cc:1211
msgid "right file id does not exist"
msgstr ""
-#: commands.cc:1616
+#: commands.cc:1222
msgid "merge failed"
msgstr ""
-#: commands.cc:1679
+#: commands.cc:1286
#, c-format
msgid "no file version %s found in database"
msgstr ""
-#: commands.cc:1691
+#: commands.cc:1298
#, c-format
msgid "no file '%s' found in revision '%s'\n"
msgstr ""
-#: commands.cc:1696
+#: commands.cc:1303
#, c-format
msgid "dumping file %s\n"
msgstr ""
-#: commands.cc:1722
+#: commands.cc:1327
#, c-format
msgid "no manifest version %s found in database"
msgstr ""
-#: commands.cc:1726
+#: commands.cc:1331
#, c-format
msgid "dumping manifest %s\n"
msgstr ""
-#: commands.cc:1751 commands.cc:1828
+#: commands.cc:1358
#, c-format
-msgid "no revision %s found in database"
-msgstr ""
-
-#: commands.cc:1755
-#, c-format
msgid "dumping revision %s\n"
msgstr ""
-#: commands.cc:1779
+#: commands.cc:1381
msgid "need --branch argument for branch-based checkout"
msgstr ""
-#: commands.cc:1789
+#: commands.cc:1390
#, c-format
msgid "branch %s is empty"
msgstr ""
-#: commands.cc:1790
+#: commands.cc:1391
#, c-format
msgid "branch %s has multiple heads"
msgstr ""
-#: commands.cc:1809
+#: commands.cc:1417
#, c-format
msgid "found %d %s branch certs on revision %s\n"
msgstr ""
-#: commands.cc:1814
+#: commands.cc:1422
#, c-format
msgid "revision %s is not a member of branch %s\n"
msgstr ""
-#: commands.cc:1834
+#: commands.cc:1439
#, c-format
msgid "no manifest %s found in database"
msgstr ""
-#: commands.cc:1836
+#: commands.cc:1441
#, c-format
msgid "checking out revision %s to directory %s\n"
msgstr ""
-#: commands.cc:1842
+#: commands.cc:1447
#, c-format
msgid "no file %s found in database for %s"
msgstr ""
-#: commands.cc:1846 commands.cc:3596
+#: commands.cc:1451 commands.cc:3307
#, c-format
msgid "writing file %s to %s\n"
msgstr ""
-#: commands.cc:1867 commands.cc:3330
+#: commands.cc:1472 commands.cc:3028
msgid "please specify a branch, with --branch=BRANCH"
msgstr ""
-#: commands.cc:1872 commands.cc:3334 commands.cc:3403 commands.cc:3406
+#: commands.cc:1477 commands.cc:3032 commands.cc:3102 commands.cc:3105
#, c-format
msgid "branch '%s' is empty\n"
msgstr ""
-#: commands.cc:1874
+#: commands.cc:1479
#, c-format
msgid "branch '%s' is currently merged:\n"
msgstr ""
-#: commands.cc:1876
+#: commands.cc:1481
#, c-format
msgid "branch '%s' is currently unmerged:\n"
msgstr ""
-#: commands.cc:1924
+#: commands.cc:1529
#, c-format
msgid "no epoch for branch %s\n"
msgstr ""
-#: commands.cc:2243
+#: commands.cc:1726 commands.cc:1728 commands.cc:1791
#, c-format
+msgid "no such manifest %s"
+msgstr ""
+
+#: commands.cc:1751 commands.cc:1753 commands.cc:1810
+#, c-format
+msgid "no such file %s"
+msgstr ""
+
+#: commands.cc:1773
+#, c-format
+msgid "no such revision %s"
+msgstr ""
+
+#: commands.cc:1842
+#, c-format
msgid "public key '%s' does not exist in database"
msgstr ""
-#: commands.cc:2258
+#: commands.cc:1858
#, c-format
msgid "private key '%s' does not exist in database"
msgstr ""
-#: commands.cc:2271
+#: commands.cc:1872
msgid "no packets found on stdin"
msgstr ""
-#: commands.cc:2273
+#: commands.cc:1874
msgid "read 1 packet\n"
msgstr ""
-#: commands.cc:2275
+#: commands.cc:1876
#, c-format
msgid "read %d packets\n"
msgstr ""
-#: commands.cc:2310
+#: commands.cc:1912
#, c-format
msgid "setting default server to %s\n"
msgstr ""
-#: commands.cc:2317
+#: commands.cc:1919
msgid "no server given and no default server set"
msgstr ""
-#: commands.cc:2321
+#: commands.cc:1923
#, c-format
msgid "using default server address: %s\n"
msgstr ""
-#: commands.cc:2332
+#: commands.cc:1934
#, c-format
msgid "setting default collection to %s\n"
msgstr ""
-#: commands.cc:2339
+#: commands.cc:1941
msgid "no collection given and no default collection set"
msgstr ""
-#: commands.cc:2343
+#: commands.cc:1945
#, c-format
msgid "using default collection: %s\n"
msgstr ""
-#: commands.cc:2356 commands.cc:2383 commands.cc:2396
+#: commands.cc:1958 commands.cc:1985 commands.cc:1998
msgid "could not guess default signing key"
msgstr ""
-#: commands.cc:2370
+#: commands.cc:1972
msgid "doing anonymous pull\n"
msgstr ""
-#: commands.cc:2400
+#: commands.cc:2002
msgid ""
"need permission to store persistent passphrase (see hook persist_phrase_ok())"
msgstr ""
-#: commands.cc:2487
+#: commands.cc:2094
#, c-format
msgid "file '%s' not found"
msgstr ""
-#: commands.cc:2504
+#: commands.cc:2162 work.cc:111
#, c-format
msgid "registering %s file in working copy\n"
msgstr ""
-#: commands.cc:2561
+#: commands.cc:2191
+#, c-format
+msgid "failed to parse date string '%s': %s"
+msgstr ""
+
+#: commands.cc:2195
+#, c-format
+msgid "failed to parse date string '%s'"
+msgstr ""
+
+#: commands.cc:2219
msgid "no changes to commit\n"
msgstr ""
-#: commands.cc:2569
+#: commands.cc:2230
#, c-format
msgid "beginning commit on branch '%s'\n"
msgstr ""
-#: commands.cc:2570
+#: commands.cc:2231
#, c-format
msgid "new manifest %s\n"
msgstr ""
-#: commands.cc:2571
+#: commands.cc:2232
#, c-format
msgid "new revision %s\n"
msgstr ""
-#: commands.cc:2575
+#: commands.cc:2236
msgid ""
"MT/log is non-empty and --message supplied\n"
"perhaps move or delete MT/log,\n"
"or remove --message from the command line?"
msgstr ""
-#: commands.cc:2593
+#: commands.cc:2254
#, c-format
msgid "revision %s already in database\n"
msgstr ""
-#: commands.cc:2598
+#: commands.cc:2259
#, c-format
msgid "inserting new revision %s\n"
msgstr ""
-#: commands.cc:2607
+#: commands.cc:2268
#, c-format
msgid "skipping manifest %s, already in database\n"
msgstr ""
-#: commands.cc:2611
+#: commands.cc:2272
#, c-format
msgid "inserting manifest delta %s -> %s\n"
msgstr ""
-#: commands.cc:2622
+#: commands.cc:2283
#, c-format
msgid "inserting full manifest %s\n"
msgstr ""
-#: commands.cc:2635
+#: commands.cc:2296
#, c-format
msgid "skipping file delta %s, already in database\n"
msgstr ""
-#: commands.cc:2641
+#: commands.cc:2302
#, c-format
msgid "inserting delta %s -> %s\n"
msgstr ""
-#: commands.cc:2651 commands.cc:2668
+#: commands.cc:2312 commands.cc:2329
#, c-format
msgid "file '%s' modified during commit, aborting"
msgstr ""
-#: commands.cc:2661
+#: commands.cc:2322
#, c-format
msgid "inserting full version %s\n"
msgstr ""
-#: commands.cc:2690
+#: commands.cc:2357
#, c-format
msgid "committed revision %s\n"
msgstr ""
-#: commands.cc:2751
+#: commands.cc:2363
+msgid ""
+"note: this revision creates divergence\n"
+"note: you may (or may not) wish to run 'monotone merge'"
+msgstr ""
+
+#: commands.cc:2426
#, c-format
msgid "--- %s\n"
msgstr ""
-#: commands.cc:2752
+#: commands.cc:2427
#, c-format
msgid "+++ %s\n"
msgstr ""
-#: commands.cc:2753
+#: commands.cc:2428
#, c-format
msgid "@@ -0,0 +1,%d @@\n"
msgstr ""
-#: commands.cc:2838 commands.cc:2854 commands.cc:2858
+#: commands.cc:2507 commands.cc:2523 commands.cc:2527
#, c-format
msgid "revision %s does not exist"
msgstr ""
-#: commands.cc:2842
+#: commands.cc:2511
msgid "current revision has no ancestor"
msgstr ""
-#: commands.cc:2885
+#: commands.cc:2554
#, c-format
msgid "no common ancestor for %s and %s"
msgstr ""
-#: commands.cc:2890
+#: commands.cc:2559
msgid "calculated diff via direct analysis\n"
msgstr ""
-#: commands.cc:2897
+#: commands.cc:2566
msgid "calculated diff via inverted direct analysis\n"
msgstr ""
-#: commands.cc:2914
+#: commands.cc:2583
#, c-format
msgid "calculated diff via common ancestor %s\n"
msgstr ""
-#: commands.cc:2919
+#: commands.cc:2588
msgid "concatenating un-committed changeset to composite\n"
msgstr ""
-#: commands.cc:2945
+#: commands.cc:2614
msgid "# no changes"
msgstr ""
-#: commands.cc:3081
+#: commands.cc:2753
#, c-format
msgid "updating %s to %s\n"
msgstr ""
-#: commands.cc:3123
+#: commands.cc:2798
msgid "this working directory is a new project; cannot update"
msgstr ""
-#: commands.cc:3130
+#: commands.cc:2805
msgid "no candidates remain after selection"
msgstr ""
-#: commands.cc:3133
+#: commands.cc:2808
msgid "multiple update candidates:\n"
msgstr ""
-#: commands.cc:3136
+#: commands.cc:2811
#, c-format
msgid " %s\n"
msgstr ""
-#: commands.cc:3137
+#: commands.cc:2812
msgid "choose one with 'monotone update '\n"
msgstr ""
-#: commands.cc:3138
+#: commands.cc:2813
msgid "multiple candidates remain after selection"
msgstr ""
-#: commands.cc:3147
+#: commands.cc:2828
#, c-format
msgid "already up to date at %s\n"
msgstr ""
-#: commands.cc:3151
+#: commands.cc:2832
#, c-format
msgid "selected update target %s\n"
msgstr ""
-#: commands.cc:3162
+#: commands.cc:2844
#, c-format
+msgid ""
+"revision %s is not a member of branch %s\n"
+"try again with explicit --branch\n"
+msgstr ""
+
+#: commands.cc:2859
+#, c-format
msgid "updating along chosen edge %s -> %s\n"
msgstr ""
-#: commands.cc:3173
+#: commands.cc:2870
#, c-format
msgid "merging working copy with chosen edge %s -> %s\n"
msgstr ""
-#: commands.cc:3202
+#: commands.cc:2899
#, c-format
msgid "updated to base revision %s\n"
msgstr ""
-#: commands.cc:3267
+#: commands.cc:2964
#, c-format
msgid "common ancestor %s found\n"
msgstr ""
-#: commands.cc:3268
+#: commands.cc:2965
msgid "trying 3-way merge\n"
msgstr ""
-#: commands.cc:3278
+#: commands.cc:2975
msgid "no common ancestor found, synthesizing edges\n"
msgstr ""
-#: commands.cc:3335
+#: commands.cc:3033
#, c-format
msgid "branch '%s' is merged\n"
msgstr ""
-#: commands.cc:3341
+#: commands.cc:3039
#, c-format
msgid "starting with revision 1 / %d\n"
msgstr ""
-#: commands.cc:3345
+#: commands.cc:3043
#, c-format
msgid "merging with revision %d / %d\n"
msgstr ""
-#: commands.cc:3346 commands.cc:3347 commands.cc:3413 commands.cc:3486
-#: commands.cc:3487
+#: commands.cc:3044 commands.cc:3045 commands.cc:3112 commands.cc:3195
+#: commands.cc:3196
#, c-format
msgid "[source] %s\n"
msgstr ""
-#: commands.cc:3359
+#: commands.cc:3057
#, c-format
msgid ""
"merge of %s\n"
" and %s\n"
msgstr ""
-#: commands.cc:3364 commands.cc:3506
+#: commands.cc:3062 commands.cc:3215
#, c-format
msgid "[merged] %s\n"
msgstr ""
-#: commands.cc:3367
-msgid "your working copies have not been updated\n"
+#: commands.cc:3065
+msgid "note: your working copies have not been updated\n"
msgstr ""
-#: commands.cc:3404 commands.cc:3407
+#: commands.cc:3103 commands.cc:3106
#, c-format
msgid "branch '%s' is not merged\n"
msgstr ""
-#: commands.cc:3412
+#: commands.cc:3111
#, c-format
msgid "propagating %s -> %s\n"
msgstr ""
-#: commands.cc:3414
+#: commands.cc:3113
#, c-format
msgid "[target] %s\n"
msgstr ""
-#: commands.cc:3419
+#: commands.cc:3118
#, c-format
msgid "branch '%s' is up-to-date with respect to branch '%s'\n"
msgstr ""
-#: commands.cc:3421
+#: commands.cc:3120
msgid "no action taken\n"
msgstr ""
-#: commands.cc:3425
+#: commands.cc:3124
#, c-format
msgid "no merge necessary; putting %s in branch '%s'\n"
msgstr ""
-#: commands.cc:3442
+#: commands.cc:3141
#, c-format
msgid ""
"propagate from branch '%s' (head %s)\n"
" to branch '%s' (head %s)\n"
msgstr ""
-#: commands.cc:3468 commands.cc:3470
+#: commands.cc:3177 commands.cc:3179
#, c-format
msgid "%s is not an ancestor of %s"
msgstr ""
-#: commands.cc:3479
+#: commands.cc:3188
#, c-format
msgid "%s and %s are the same revision, aborting"
msgstr ""
-#: commands.cc:3481 commands.cc:3483
+#: commands.cc:3190 commands.cc:3192
#, c-format
msgid "%s is already an ancestor of %s"
msgstr ""
-#: commands.cc:3497
+#: commands.cc:3206
#, c-format
msgid ""
"explicit_merge of %s\n"
@@ -1277,351 +1219,363 @@
" to branch '%s'\n"
msgstr ""
-#: commands.cc:3517 commands.cc:3527 commands.cc:3537
+#: commands.cc:3228 commands.cc:3238 commands.cc:3248
msgid "non-hex digits in partial id"
msgstr ""
-#: commands.cc:3588
+#: commands.cc:3299
#, c-format
msgid "reverting %s from %s to %s\n"
msgstr ""
-#: commands.cc:3592
+#: commands.cc:3303
#, c-format
msgid "no file version %s found in database for %s"
msgstr ""
-#: commands.cc:3720
+#: commands.cc:3388
#, c-format
+msgid "annotate file file_path '%s'\n"
+msgstr ""
+
+#: commands.cc:3397
+#, c-format
+msgid "No such file '%s' in revision %s\n"
+msgstr ""
+
+#: commands.cc:3399
+#, c-format
+msgid "annotate for file_id %s\n"
+msgstr ""
+
+#: commands.cc:3455
+#, c-format
msgid "revision %s does not exist in db, skipping\n"
msgstr ""
-#: commands.cc:3753
+#: commands.cc:3488
#, c-format
msgid "revision '%s' in '%s' maps to '%s' in %s\n"
msgstr ""
-#: commands.cc:3863
+#: commands.cc:3608
#, c-format
msgid "no var with name %s in domain %s"
msgstr ""
-#: database.cc:130
+#: database.cc:131
#, c-format
msgid ""
"database schemas do not match: wanted %s, got %s. try migrating database"
msgstr ""
-#: database.cc:181
+#: database.cc:182
#, c-format
msgid "database %s is a directory\n"
msgstr ""
-#: database.cc:188
+#: database.cc:189
#, c-format
msgid "unable to probe database version in file %s"
msgstr ""
-#: database.cc:195
+#: database.cc:196
#, c-format
msgid "database %s is not an sqlite version 3 file, try dump and reload"
msgstr ""
-#: database.cc:207
+#: database.cc:208
msgid "no database specified"
msgstr ""
-#: database.cc:212
+#: database.cc:213
#, c-format
msgid "database %s does not exist"
msgstr ""
-#: database.cc:214
+#: database.cc:215
#, c-format
msgid "database %s is a directory"
msgstr ""
-#: database.cc:240
+#: database.cc:241
#, c-format
msgid "could not initialize database: %s: already exists"
msgstr ""
-#: database.cc:245
+#: database.cc:246
#, c-format
msgid ""
"existing (possibly stale) journal file '%s' has same stem as new database '%"
"s'"
msgstr ""
-#: database.cc:270
+#: database.cc:271
#, c-format
msgid "INSERT INTO %s VALUES("
msgstr ""
-#: database.cc:339 database.cc:433 database.cc:450
+#: database.cc:340 database.cc:434 database.cc:451
msgid "need database name"
msgstr ""
-#: database.cc:341
+#: database.cc:342
#, c-format
msgid "cannot create %s; it already exists\n"
msgstr ""
-#: database.cc:655
+#: database.cc:656
#, c-format
msgid "db.execute(\"%s\")\n"
msgstr ""
-#: database.cc:695
+#: database.cc:696
#, c-format
msgid "db.fetch(\"%s\")\n"
msgstr ""
-#: database.cc:722
+#: database.cc:723
#, c-format
msgid "%s wanted %d columns, got %s"
msgstr ""
-#: database.cc:727
+#: database.cc:728
#, c-format
msgid "%s wanted %d rows, got %s"
msgstr ""
-#: database.cc:940
+#: database.cc:952
#, c-format
msgid "%08.8x%08.8x%08.8x%08.8x%08.8x"
msgstr ""
-#: database.cc:952
+#: database.cc:964
#, c-format
msgid "version cache expiring %s\n"
msgstr ""
-#: database.cc:975
+#: database.cc:986
#, c-format
msgid "version cache hit on %s\n"
msgstr ""
-#: database.cc:1020
+#: database.cc:1031
#, c-format
msgid "reconstructing %s in %s\n"
msgstr ""
-#: database.cc:1070
+#: database.cc:1081
#, c-format
msgid "inserting edge: %s <- %s\n"
msgstr ""
-#: database.cc:1074
+#: database.cc:1085
#, c-format
msgid "skipping merge edge %s <- %s\n"
msgstr ""
-#: database.cc:1122
+#: database.cc:1131
#, c-format
msgid "following delta %s -> %s\n"
msgstr ""
-#: database.cc:2161
+#: database.cc:1496
#, c-format
+msgid "Killing revision %s locally\n"
+msgstr ""
+
+#: database.cc:1647 database.cc:1659
+#, c-format
+msgid "another key with name '%s' already exists"
+msgstr ""
+
+#: database.cc:2198
+#, c-format
msgid "WHERE id GLOB '%s*'"
msgstr ""
-#: database.cc:2167
+#: database.cc:2216
#, c-format
+msgid "WHERE name='%s' AND unbase64(value) glob '%s'"
+msgstr ""
+
+#: database.cc:2222
+#, c-format
+msgid "WHERE name='%s'"
+msgstr ""
+
+#: database.cc:2231
+#, c-format
msgid " WHERE (name='%s' OR name='%s' OR name='%s')"
msgstr ""
-#: database.cc:2171
+#: database.cc:2235
#, c-format
msgid " AND unbase64(value) glob '*%s*'"
msgstr ""
-#: database.cc:2179
+#: database.cc:2243
#, c-format
msgid "WHERE name='%s' AND unbase64(value) glob '*%s*'"
msgstr ""
-#: database.cc:2193
+#: database.cc:2257
#, c-format
msgid "SELECT id FROM %s"
msgstr ""
-#: database.cc:2201
+#: database.cc:2265
#, c-format
msgid " (name='%s' OR name='%s' OR name='%s')"
msgstr ""
-#: database.cc:2211
+#: database.cc:2275
#, c-format
msgid " (name='%s')"
msgstr ""
-#: database.cc:2214
+#: database.cc:2278
#, c-format
msgid " AND (unbase64(value) GLOB '*%s*')"
msgstr ""
-#: database.cc:2215
+#: database.cc:2279
#, c-format
msgid " AND (id IN %s)"
msgstr ""
-#: diff_patch.cc:215
-msgid ""
-"You've found files that trigger a strange edge-case of the merge logic.\n"
-msgstr ""
-
-#: diff_patch.cc:216
-msgid ""
-"We believe it works, but don't have many tests; so, if you could send us\n"
-msgstr ""
-
-#: diff_patch.cc:217
-msgid ""
-"a note, and, if possible, the files that triggered it for inclusion in our\n"
-msgstr ""
-
-#: diff_patch.cc:218
-msgid "test suite, we'd appreciate it. Address: "
-msgstr ""
-
-#: diff_patch.cc:218
-msgid ". Thanks!\n"
-msgstr ""
-
-#: diff_patch.cc:220
+#: diff_patch.cc:221
#, c-format
msgid "exchanging preserved extent [%d+%d] with changed extent [%d+%d]\n"
msgstr ""
-#: diff_patch.cc:311
+#: diff_patch.cc:312
#, c-format
msgid "conflicting edits: %s %d[%d] '%s' vs. %s %d[%d] '%s'\n"
msgstr ""
-#: diff_patch.cc:339
+#: diff_patch.cc:340
#, c-format
msgid "conflicting edits: [%s %d %d] vs. [%s %d %d]\n"
msgstr ""
-#: diff_patch.cc:387
+#: diff_patch.cc:388
#, c-format
msgid "calculating left edit script on %d -> %d lines\n"
msgstr ""
-#: diff_patch.cc:395
+#: diff_patch.cc:396
#, c-format
msgid "calculating right edit script on %d -> %d lines\n"
msgstr ""
-#: diff_patch.cc:403
+#: diff_patch.cc:404
#, c-format
msgid "calculating left extents on %d edits\n"
msgstr ""
-#: diff_patch.cc:408
+#: diff_patch.cc:409
#, c-format
msgid "calculating right extents on %d edits\n"
msgstr ""
-#: diff_patch.cc:413
+#: diff_patch.cc:414
#, c-format
msgid "normalizing %d right extents\n"
msgstr ""
-#: diff_patch.cc:416
+#: diff_patch.cc:417
#, c-format
msgid "normalizing %d left extents\n"
msgstr ""
-#: diff_patch.cc:422
+#: diff_patch.cc:423
msgid "conflicting prefixes\n"
msgstr ""
-#: diff_patch.cc:428
+#: diff_patch.cc:429
msgid "conflicting suffixes\n"
msgstr ""
-#: diff_patch.cc:432
+#: diff_patch.cc:433
#, c-format
msgid "merging %d left, %d right extents\n"
msgstr ""
-#: diff_patch.cc:463
+#: diff_patch.cc:464
msgid "conflict detected. no merge.\n"
msgstr ""
-#: diff_patch.cc:483
+#: diff_patch.cc:484
#, c-format
msgid "recording successful merge of %s <-> %s into %s\n"
msgstr ""
-#: diff_patch.cc:527
+#: diff_patch.cc:528
#, c-format
msgid "trying to merge %s <-> %s (ancestor: %s)\n"
msgstr ""
-#: diff_patch.cc:532 diff_patch.cc:625
+#: diff_patch.cc:533 diff_patch.cc:626
msgid "files are identical\n"
msgstr ""
-#: diff_patch.cc:567
+#: diff_patch.cc:568
msgid "internal 3-way merged ok\n"
msgstr ""
-#: diff_patch.cc:580
+#: diff_patch.cc:581
msgid "help required for 3-way merge\n"
msgstr ""
-#: diff_patch.cc:581
+#: diff_patch.cc:582
#, c-format
msgid "[ancestor] %s\n"
msgstr ""
-#: diff_patch.cc:582 diff_patch.cc:637
+#: diff_patch.cc:583 diff_patch.cc:638
#, c-format
msgid "[ left] %s\n"
msgstr ""
-#: diff_patch.cc:583 diff_patch.cc:638
+#: diff_patch.cc:584 diff_patch.cc:639
#, c-format
msgid "[ right] %s\n"
msgstr ""
-#: diff_patch.cc:584 diff_patch.cc:639
+#: diff_patch.cc:585 diff_patch.cc:640
#, c-format
msgid "[ merged] %s\n"
msgstr ""
-#: diff_patch.cc:593
+#: diff_patch.cc:594
msgid "lua merge3 hook merged ok\n"
msgstr ""
-#: diff_patch.cc:620
+#: diff_patch.cc:621
#, c-format
msgid "trying to merge %s <-> %s\n"
msgstr ""
-#: diff_patch.cc:636
+#: diff_patch.cc:637
msgid "help required for 2-way merge\n"
msgstr ""
-#: diff_patch.cc:647
+#: diff_patch.cc:648
msgid "lua merge2 hook merged ok\n"
msgstr ""
-#: diff_patch.cc:678
+#: diff_patch.cc:679
#, c-format
msgid "temporarily recording merge of %s <-> %s into %s\n"
msgstr ""
-#: diff_patch.cc:695
+#: diff_patch.cc:696
#, c-format
msgid "file %s does not exist in working copy"
msgstr ""
-#: diff_patch.cc:699
+#: diff_patch.cc:700
#, c-format
msgid "file %s in working copy has id %s, wanted %s"
msgstr ""
@@ -1692,66 +1646,66 @@
msgid "could not find home directory for uid %d"
msgstr ""
-#: file_io.cc:213
+#: file_io.cc:199
#, c-format
msgid "could not find home directory for user %s"
msgstr ""
-#: file_io.cc:270 file_io.cc:278
+#: file_io.cc:256 file_io.cc:264
#, c-format
msgid "file to delete '%s' does not exist"
msgstr ""
-#: file_io.cc:286 file_io.cc:294
+#: file_io.cc:272 file_io.cc:280
#, c-format
msgid "directory to delete '%s' does not exist"
msgstr ""
-#: file_io.cc:303 file_io.cc:315
+#: file_io.cc:289 file_io.cc:301
#, c-format
msgid "rename source file '%s' does not exist"
msgstr ""
-#: file_io.cc:305 file_io.cc:317
+#: file_io.cc:291 file_io.cc:303
#, c-format
msgid "rename target file '%s' already exists"
msgstr ""
-#: file_io.cc:327 file_io.cc:339
+#: file_io.cc:313 file_io.cc:325
#, c-format
msgid "rename source dir '%s' does not exist"
msgstr ""
-#: file_io.cc:329 file_io.cc:341
+#: file_io.cc:315 file_io.cc:327
#, c-format
msgid "rename target dir '%s' already exists"
msgstr ""
-#: file_io.cc:392
+#: file_io.cc:378
msgid "Cannot read standard input multiple times"
msgstr ""
-#: file_io.cc:515
+#: file_io.cc:505
#, c-format
msgid "unlinking %s failed"
msgstr ""
-#: file_io.cc:517
+#: file_io.cc:507
#, c-format
msgid "rename of %s to %s failed"
msgstr ""
-#: file_io.cc:604
+#: file_io.cc:597
#, c-format
msgid "ignoring book keeping entry %s\n"
msgstr ""
-#: file_io.cc:623
+#: file_io.cc:616
#, c-format
msgid "caught runtime error %s constructing file path for %s\n"
msgstr ""
-#: file_io.cc:654
+#: file_io.cc:648
#, c-format
msgid "no such file or directory: %s"
msgstr ""
@@ -1846,105 +1800,105 @@
msgid "%d bytes random-seeded input -> tests as %f randomness\n"
msgstr ""
-#: lua.cc:217
+#: lua.cc:227
msgid "lua istable() failed\n"
msgstr ""
-#: lua.cc:223
+#: lua.cc:233
msgid "lua stack top > 0 failed\n"
msgstr ""
-#: lua.cc:237
+#: lua.cc:247
msgid "lua isfunction() failed in get_fn\n"
msgstr ""
-#: lua.cc:249
+#: lua.cc:259
msgid "lua istable() failed in get_tab\n"
msgstr ""
-#: lua.cc:261
+#: lua.cc:271
msgid "lua isstring() failed in get_str\n"
msgstr ""
-#: lua.cc:273
+#: lua.cc:283
msgid "lua isnumber() failed in get_num\n"
msgstr ""
-#: lua.cc:285
+#: lua.cc:295
msgid "lua isboolean() failed in get_bool\n"
msgstr ""
-#: lua.cc:298
+#: lua.cc:308
msgid "lua isstring() failed in extract_str\n"
msgstr ""
-#: lua.cc:311
+#: lua.cc:321
msgid "lua isnumber() failed in extract_int\n"
msgstr ""
-#: lua.cc:324
+#: lua.cc:334
msgid "lua isnumber() failed in extract_double\n"
msgstr ""
-#: lua.cc:338
+#: lua.cc:348
msgid "lua isboolean() failed in extract_bool\n"
msgstr ""
-#: lua.cc:354
+#: lua.cc:364
msgid "lua istable() failed in begin\n"
msgstr ""
-#: lua.cc:368
+#: lua.cc:378
msgid "lua istable() failed in next\n"
msgstr ""
-#: lua.cc:440
+#: lua.cc:458
#, c-format
msgid "lua pcall() failed: %s\n"
msgstr ""
-#: lua.cc:452
+#: lua.cc:470
msgid "lua stack top >= count failed\n"
msgstr ""
-#: lua.cc:525
+#: lua.cc:561
#, c-format
msgid "opening rcfile '%s' ...\n"
msgstr ""
-#: lua.cc:527
+#: lua.cc:563
#, c-format
msgid "lua error while loading '%s'"
msgstr ""
-#: lua.cc:528
+#: lua.cc:564
#, c-format
msgid "'%s' is ok\n"
msgstr ""
-#: lua.cc:532
+#: lua.cc:568
#, c-format
msgid "rcfile '%s' does not exist"
msgstr ""
-#: lua.cc:533
+#: lua.cc:569
#, c-format
msgid "skipping nonexistent rcfile '%s'\n"
msgstr ""
-#: manifest.cc:57
+#: manifest.cc:56
#, c-format
msgid "scanning file %s\n"
msgstr ""
-#: manifest.cc:98
+#: manifest.cc:198
#, c-format
-msgid "file disappeared but exists in new manifest: %s"
+msgid "missing %s"
msgstr ""
-#: manifest.cc:108
+#: manifest.cc:211
#, c-format
-msgid "file restricted but does not exist in old manifest: %s"
+msgid "%d missing files\n"
msgstr ""
#: merkle_tree.cc:281
@@ -1957,31 +1911,46 @@
msgid "mismatched node hash value %s, expected %s"
msgstr ""
-#: monotone.cc:179
+#: monotone.cc:175
#, c-format
msgid "problem parsing arguments from file %s: %s"
msgstr ""
-#: monotone.cc:188
+#: monotone.cc:184
#, c-format
msgid "weird error when stuffing arguments read from %s: %s\n"
msgstr ""
-#: monotone.cc:223
+#: monotone.cc:228
#, c-format
msgid "command line: %s\n"
msgstr ""
-#: monotone.cc:226
+#: monotone.cc:231
#, c-format
msgid "set locale: LC_CTYPE=%s, LC_MESSAGES=%s\n"
msgstr ""
-#: monotone.cc:350
+#: monotone.cc:365
#, c-format
msgid "syntax error near the \"%s\" option: %s"
msgstr ""
+#: monotone.cc:404
+#, c-format
+msgid "monotone %s doesn't use the option %s"
+msgstr ""
+
+#: monotone.cc:426
+#, c-format
+msgid "Removed 'hidden' from option # %d\n"
+msgstr ""
+
+#: monotone.cc:432 monotone.cc:443
+#, c-format
+msgid "Added 'hidden' to option # %d\n"
+msgstr ""
+
#: netcmd.cc:44
#, c-format
msgid "unknown item type 0x%x for '%s'"
@@ -2473,112 +2442,116 @@
#: netsync.cc:1453
#, c-format
-msgid "first time connecting to server %s; authenticity can't be established\n"
+msgid "first time connecting to server %s\n"
msgstr ""
#: netsync.cc:1454
+msgid "I'll assume it's really them, but you might want to\n"
+msgstr ""
+
+#: netsync.cc:1455
#, c-format
-msgid "their key is %s\n"
+msgid "double-check their key's fingerprint: %s\n"
msgstr ""
-#: netsync.cc:1459
+#: netsync.cc:1460
#, c-format
msgid "saving public key for %s to database\n"
msgstr ""
-#: netsync.cc:1466
+#: netsync.cc:1467
#, c-format
msgid "received 'hello' netcmd from server '%s' with nonce '%s'\n"
msgstr ""
-#: netsync.cc:1516
+#: netsync.cc:1517
#, c-format
msgid ""
"received 'anonymous' netcmd from client for collection '%s' in %s mode with "
"nonce2 '%s'\n"
msgstr ""
-#: netsync.cc:1535 netsync.cc:1627
+#: netsync.cc:1536 netsync.cc:1628
#, c-format
msgid "not currently serving requested collection '%s'\n"
msgstr ""
-#: netsync.cc:1555
+#: netsync.cc:1556
msgid "rejected attempt at anonymous connection for write\n"
msgstr ""
-#: netsync.cc:1563
+#: netsync.cc:1564
#, c-format
msgid "anonymous read permission denied for '%s'\n"
msgstr ""
-#: netsync.cc:1569
+#: netsync.cc:1570
msgid "anonymous read permitted, signing back nonce\n"
msgstr ""
-#: netsync.cc:1600
+#: netsync.cc:1601
#, c-format
msgid ""
"received 'auth' netcmd from client '%s' for collection '%s' in %s mode with "
"nonce1 '%s' and nonce2 '%s'\n"
msgstr ""
-#: netsync.cc:1609
+#: netsync.cc:1610
msgid "detected replay attack in auth netcmd\n"
msgstr ""
-#: netsync.cc:1647
+#: netsync.cc:1648
#, c-format
-msgid "unknown key hash '%s'\n"
+msgid "remote public key hash '%s' is unknown\n"
msgstr ""
-#: netsync.cc:1663
+#: netsync.cc:1664
#, c-format
msgid "read permission denied for '%s'\n"
msgstr ""
-#: netsync.cc:1675
+#: netsync.cc:1676
#, c-format
msgid "write permission denied for '%s'\n"
msgstr ""
-#: netsync.cc:1690
+#: netsync.cc:1691
msgid "client signature OK, accepting authentication\n"
msgstr ""
-#: netsync.cc:1719
+#: netsync.cc:1720
msgid "bad client signature\n"
msgstr ""
-#: netsync.cc:1734
+#: netsync.cc:1735
#, c-format
msgid ""
"received 'confirm' netcmd from server '%s' for collection '%s' in %s mode\n"
msgstr ""
-#: netsync.cc:1749
+#: netsync.cc:1750
msgid "server signature OK, accepting authentication\n"
msgstr ""
-#: netsync.cc:1768
+#: netsync.cc:1769
msgid "bad server signature\n"
msgstr ""
-#: netsync.cc:1773
+#: netsync.cc:1774
msgid "unknown server key\n"
msgstr ""
-#: netsync.cc:1825
+#: netsync.cc:1826
#, c-format
msgid "epoch with hash '%s' does not exist in our database"
msgstr ""
-#: netsync.cc:1835
+#: netsync.cc:1836
#, c-format
msgid "public key '%s' is also called '%s'\n"
msgstr ""
-#: netsync.cc:1840
+#: netsync.cc:1841
#, c-format
msgid "public key '%s' does not exist in our database"
msgstr ""
@@ -2588,492 +2561,497 @@
msgid "revision '%s' does not exist in our database"
msgstr ""
-#: netsync.cc:1870
+#: netsync.cc:1869
#, c-format
msgid "manifest '%s' does not exist in our database"
msgstr ""
-#: netsync.cc:1885
+#: netsync.cc:1883
#, c-format
msgid "file '%s' does not exist in our database"
msgstr ""
-#: netsync.cc:1899
+#: netsync.cc:1897
#, c-format
msgid "cert '%s' does not exist in our database"
msgstr ""
-#: netsync.cc:1918
+#: netsync.cc:1916
#, c-format
msgid "received 'refine' netcmd on %s node '%s', level %d\n"
msgstr ""
-#: netsync.cc:1924
+#: netsync.cc:1922
#, c-format
msgid "no corresponding %s merkle node for prefix '%s', level %d\n"
msgstr ""
-#: netsync.cc:1934
+#: netsync.cc:1932
#, c-format
msgid ""
"(#0) they have an empty slot %d (in a %s node '%s', level %d, we do not "
"have)\n"
msgstr ""
-#: netsync.cc:1946
+#: netsync.cc:1944
#, c-format
msgid ""
"(#0) they have a live leaf at slot %d (in a %s node '%s', level %d, we do "
"not have)\n"
msgstr ""
-#: netsync.cc:1948
+#: netsync.cc:1946
#, c-format
msgid "(#0) requesting their %s leaf %s\n"
msgstr ""
-#: netsync.cc:1955
+#: netsync.cc:1953
#, c-format
msgid ""
"(#0) they have a dead leaf at slot %d (in a %s node '%s', level %d, we do "
"not have)\n"
msgstr ""
-#: netsync.cc:1963
+#: netsync.cc:1961
#, c-format
msgid ""
"(#0) they have a subtree at slot %d (in a %s node '%s', level %d, we do not "
"have)\n"
msgstr ""
-#: netsync.cc:1979
+#: netsync.cc:1977
#, c-format
msgid "found corresponding %s merkle node for prefix '%s', level %d\n"
msgstr ""
-#: netsync.cc:1994
+#: netsync.cc:1992
#, c-format
msgid ""
"(#1) they have an empty slot %d in %s node '%s', level %d, and so do we\n"
msgstr ""
-#: netsync.cc:2001
+#: netsync.cc:1999
#, c-format
msgid ""
"(#2) they have an empty slot %d in %s node '%s', level %d, we have a live "
"leaf\n"
msgstr ""
-#: netsync.cc:2015
+#: netsync.cc:2013
#, c-format
msgid ""
"(#3) they have an empty slot %d in %s node '%s', level %d, we have a dead "
"leaf\n"
msgstr ""
-#: netsync.cc:2022
+#: netsync.cc:2020
#, c-format
msgid ""
"(#4) they have an empty slot %d in %s node '%s', level %d, we have a "
"subtree\n"
msgstr ""
-#: netsync.cc:2046
+#: netsync.cc:2044
#, c-format
msgid ""
"(#5) they have a live leaf at slot %d in %s node '%s', level %d, we have "
"nothing\n"
msgstr ""
-#: netsync.cc:2057
+#: netsync.cc:2055
#, c-format
msgid "(#6) they have a live leaf at slot %d in %s node '%s', and so do we\n"
msgstr ""
-#: netsync.cc:2067
+#: netsync.cc:2065
#, c-format
msgid "(#6) we both have live %s leaf '%s'\n"
msgstr ""
-#: netsync.cc:2083
+#: netsync.cc:2081
#, c-format
msgid ""
"(#7) they have a live leaf at slot %d in %s node %s, level %d, we have a "
"dead one\n"
msgstr ""
-#: netsync.cc:2093
+#: netsync.cc:2091
#, c-format
msgid "(#7) it's the same %s leaf '%s', but ours is dead\n"
msgstr ""
-#: netsync.cc:2106
+#: netsync.cc:2104
#, c-format
msgid ""
"(#8) they have a live leaf in slot %d of %s node '%s', level %d, we have a "
"subtree\n"
msgstr ""
-#: netsync.cc:2115
+#: netsync.cc:2113
#, c-format
msgid ""
"(#8) we have a copy of their live leaf '%s' in slot %d of %s node '%s', "
"level %d\n"
msgstr ""
-#: netsync.cc:2119
+#: netsync.cc:2117
#, c-format
msgid ""
"(#8) requesting a copy of their live leaf '%s' in slot %d of %s node '%s', "
"level %d\n"
msgstr ""
-#: netsync.cc:2124
+#: netsync.cc:2122
#, c-format
msgid ""
"(#8) sending our subtree for refinement, in slot %d of %s node '%s', level %"
"d\n"
msgstr ""
-#: netsync.cc:2143
+#: netsync.cc:2141
#, c-format
msgid ""
"(#9) they have a dead leaf at slot %d in %s node '%s', level %d, we have "
"nothing\n"
msgstr ""
-#: netsync.cc:2150
+#: netsync.cc:2148
#, c-format
msgid ""
"(#10) they have a dead leaf at slot %d in %s node '%s', level %d, we have a "
"live one\n"
msgstr ""
-#: netsync.cc:2160
+#: netsync.cc:2158
#, c-format
msgid "(#10) we both have %s leaf %s, theirs is dead\n"
msgstr ""
-#: netsync.cc:2176
+#: netsync.cc:2174
#, c-format
msgid ""
"(#11) they have a dead leaf at slot %d in %s node '%s', level %d, so do we\n"
msgstr ""
-#: netsync.cc:2183
+#: netsync.cc:2181
#, c-format
msgid ""
"(#12) they have a dead leaf in slot %d of %s node '%s', we have a subtree\n"
msgstr ""
-#: netsync.cc:2203
+#: netsync.cc:2201
#, c-format
msgid ""
"(#13) they have a subtree at slot %d in %s node '%s', level %d, we have "
"nothing\n"
msgstr ""
-#: netsync.cc:2216
+#: netsync.cc:2214
#, c-format
msgid ""
"(#14) they have a subtree at slot %d in %s node '%s', level %d, we have a "
"live leaf\n"
msgstr ""
-#: netsync.cc:2228
+#: netsync.cc:2226
#, c-format
msgid "(#14) pushed our leaf '%s' into fake subtree slot %d, level %d\n"
msgstr ""
-#: netsync.cc:2240
+#: netsync.cc:2238
#, c-format
msgid ""
"(#15) they have a subtree at slot %d in %s node '%s', level %d, we have a "
"dead leaf\n"
msgstr ""
-#: netsync.cc:2259
+#: netsync.cc:2257
#, c-format
msgid ""
"(#16) they have a subtree at slot %d in %s node '%s', level %d, and so do "
"we\n"
msgstr ""
-#: netsync.cc:2269
+#: netsync.cc:2267
#, c-format
msgid "(#16) we both have %s subtree '%s'\n"
msgstr ""
-#: netsync.cc:2274
+#: netsync.cc:2272
#, c-format
msgid "(#16) %s subtrees at slot %d differ, refining ours\n"
msgstr ""
-#: netsync.cc:2301
+#: netsync.cc:2299
#, c-format
msgid "received 'send_data' netcmd requesting %s '%s'\n"
msgstr ""
-#: netsync.cc:2329
+#: netsync.cc:2327
#, c-format
msgid "received 'send_delta' netcmd requesting %s edge '%s' -> '%s'\n"
msgstr ""
-#: netsync.cc:2383
+#: netsync.cc:2381
#, c-format
msgid "delta requested for item type %s\n"
msgstr ""
-#: netsync.cc:2406
+#: netsync.cc:2404
#, c-format
msgid "epoch '%s' already exists in our database\n"
msgstr ""
-#: netsync.cc:2413
+#: netsync.cc:2411
#, c-format
msgid "received epoch %s for branch %s\n"
msgstr ""
-#: netsync.cc:2420
+#: netsync.cc:2418
#, c-format
msgid "branch %s has no epoch; setting epoch to %s\n"
msgstr ""
-#: netsync.cc:2426
+#: netsync.cc:2424
#, c-format
msgid "branch %s already has an epoch; checking\n"
msgstr ""
-#: netsync.cc:2437
+#: netsync.cc:2435
#, c-format
msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'."
msgstr ""
-#: netsync.cc:2448
+#: netsync.cc:2446
#, c-format
msgid "public key '%s' already exists in our database\n"
msgstr ""
-#: netsync.cc:2457
+#: netsync.cc:2455
#, c-format
msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'"
msgstr ""
-#: netsync.cc:2466
+#: netsync.cc:2464
#, c-format
msgid "cert '%s' already exists in our database\n"
msgstr ""
-#: netsync.cc:2474
+#: netsync.cc:2472
#, c-format
msgid "hash check failed for revision cert '%s'"
msgstr ""
-#: netsync.cc:2489
+#: netsync.cc:2487
#, c-format
msgid "revision '%s' already exists in our database\n"
msgstr ""
-#: netsync.cc:2492
+#: netsync.cc:2490
#, c-format
msgid "received revision '%s' \n"
msgstr ""
-#: netsync.cc:2513
+#: netsync.cc:2509
#, c-format
msgid "manifest version '%s' already exists in our database\n"
msgstr ""
-#: netsync.cc:2530
+#: netsync.cc:2524
#, c-format
msgid "file version '%s' already exists in our database\n"
msgstr ""
-#: netsync.cc:2608
+#: netsync.cc:2596
#, c-format
msgid "ignoring delta received for item type %s\n"
msgstr ""
-#: netsync.cc:2622
+#: netsync.cc:2610
#, c-format
msgid "received 'nonexistant' netcmd for %s '%s'\n"
msgstr ""
-#: netsync.cc:2865
+#: netsync.cc:2853
#, c-format
msgid "processing %d byte input buffer from peer %s\n"
msgstr ""
-#: netsync.cc:2868
+#: netsync.cc:2856
#, c-format
msgid "input buffer for peer %s is overfull after netcmd dispatch\n"
msgstr ""
-#: netsync.cc:2875
+#: netsync.cc:2863
#, c-format
msgid "caught bad_decode exception processing peer %s: '%s'\n"
msgstr ""
-#: netsync.cc:2895
+#: netsync.cc:2883
#, c-format
msgid "connecting to %s\n"
msgstr ""
-#: netsync.cc:2928 netsync.cc:2955
+#: netsync.cc:2916 netsync.cc:2943
#, c-format
msgid "caught bad_decode exception decoding input from peer %s: '%s'\n"
msgstr ""
-#: netsync.cc:2941
+#: netsync.cc:2929
#, c-format
msgid "timed out waiting for I/O with peer %s, disconnecting\n"
msgstr ""
-#: netsync.cc:2963
+#: netsync.cc:2951
#, c-format
msgid "read from fd %d (peer %s) closed OK after goodbye\n"
msgstr ""
-#: netsync.cc:2965
+#: netsync.cc:2953
#, c-format
msgid "read from fd %d (peer %s) failed, disconnecting\n"
msgstr ""
-#: netsync.cc:2975
+#: netsync.cc:2963
#, c-format
msgid "write on fd %d (peer %s) closed OK after goodbye\n"
msgstr ""
-#: netsync.cc:2977
+#: netsync.cc:2965
#, c-format
msgid "write on fd %d (peer %s) failed, disconnecting\n"
msgstr ""
-#: netsync.cc:2984
+#: netsync.cc:2972
#, c-format
msgid "got OOB data on fd %d (peer %s), disconnecting\n"
msgstr ""
-#: netsync.cc:2993
+#: netsync.cc:2981
#, c-format
msgid "terminated exchange with %s\n"
msgstr ""
-#: netsync.cc:3001
+#: netsync.cc:2989
#, c-format
msgid "successful exchange with %s\n"
msgstr ""
-#: netsync.cc:3022
+#: netsync.cc:3010
#, c-format
msgid "fd %d is armed\n"
msgstr ""
-#: netsync.cc:3029
+#: netsync.cc:3017
#, c-format
msgid ""
"caught bad_decode exception decoding input from peer %s: '%s', marking as "
"bad\n"
msgstr ""
-#: netsync.cc:3051
+#: netsync.cc:3039
#, c-format
msgid "accepting new connection on %s : %d\n"
msgstr ""
-#: netsync.cc:3057
+#: netsync.cc:3045
msgid "accept() returned a dead client\n"
msgstr ""
-#: netsync.cc:3061
+#: netsync.cc:3049
#, c-format
msgid "accepted new client connection from %s\n"
msgstr ""
-#: netsync.cc:3087
+#: netsync.cc:3075
#, c-format
msgid ""
"caught bad_decode exception decoding input from peer %s: '%s', "
"disconnecting\n"
msgstr ""
-#: netsync.cc:3095
+#: netsync.cc:3083
#, c-format
msgid "fd %d (peer %s) read failed, disconnecting\n"
msgstr ""
-#: netsync.cc:3111
+#: netsync.cc:3099
#, c-format
msgid "fd %d (peer %s) write failed, disconnecting\n"
msgstr ""
-#: netsync.cc:3135
+#: netsync.cc:3123
#, c-format
msgid "fd %d (peer %s) processing finished, disconnecting\n"
msgstr ""
-#: netsync.cc:3157
+#: netsync.cc:3145
#, c-format
msgid "fd %d (peer %s) has been idle too long, disconnecting\n"
msgstr ""
-#: netsync.cc:3163
+#: netsync.cc:3151
#, c-format
msgid "fd %d (peer %s) exchanged goodbyes and flushed output, disconnecting\n"
msgstr ""
-#: netsync.cc:3194
+#: netsync.cc:3182
#, c-format
msgid "beginning service on %s : %d\n"
msgstr ""
-#: netsync.cc:3208
+#: netsync.cc:3196
#, c-format
msgid "session limit %d reached, some connections will be refused\n"
msgstr ""
-#: netsync.cc:3214
+#: netsync.cc:3202
#, c-format
msgid "i/o probe with %d armed\n"
msgstr ""
-#: netsync.cc:3224
+#: netsync.cc:3212
#, c-format
msgid "timed out waiting for I/O (listening on %s : %d)\n"
msgstr ""
-#: netsync.cc:3240
+#: netsync.cc:3228
#, c-format
msgid "got woken up for action on unknown fd %d\n"
msgstr ""
-#: netsync.cc:3255
+#: netsync.cc:3243
#, c-format
msgid "got some OOB data on fd %d (peer %s), disconnecting\n"
msgstr ""
-#: netsync.cc:3312
+#: netsync.cc:3300
#, c-format
msgid "rebuilding merkle trees for collection %s\n"
msgstr ""
-#: netsync.cc:3336
+#: netsync.cc:3324
#, c-format
msgid "including branch %s\n"
msgstr ""
-#: netsync.cc:3356
+#: netsync.cc:3344
#, c-format
msgid "setting epoch on %s to zero\n"
msgstr ""
-#: netsync.cc:3442
+#: netsync.cc:3430
#, c-format
msgid "%s included in collection %s\n"
msgstr ""
-#: netsync.cc:3471
+#: netsync.cc:3459
#, c-format
+msgid "network exception: %s"
+msgstr ""
+
+#: netsync.cc:3464
+#, c-format
msgid "trapped network exception: %s\n"
msgstr ""
@@ -3298,487 +3276,544 @@
msgid "wrote %i queued packets\n"
msgstr ""
-#: packet.cc:1191
+#: packet.cc:1205
msgid "read data packet\n"
msgstr ""
-#: packet.cc:1211
+#: packet.cc:1227
msgid "read delta packet\n"
msgstr ""
-#: packet.cc:1240
+#: packet.cc:1258
msgid "read cert packet\n"
msgstr ""
-#: packet.cc:1266
+#: packet.cc:1284
msgid "read key data packet\n"
msgstr ""
-#: rcs_import.cc:370
+#: rcs_import.cc:67
+#, c-format
+msgid "Checking similarity of %d and %d\n"
+msgstr ""
+
+#: rcs_import.cc:78
+#, c-format
+msgid "checking %s %s\n"
+msgstr ""
+
+#: rcs_import.cc:82
+#, c-format
+msgid "!similar_enough: %d/%d\n"
+msgstr ""
+
+#: rcs_import.cc:87
+#, c-format
+msgid "Same file, different version: %s and %s\n"
+msgstr ""
+
+#: rcs_import.cc:90
+#, c-format
+msgid "similar_enough: %d/%d\n"
+msgstr ""
+
+#: rcs_import.cc:96
+#, c-format
+msgid "Checking equality of %d and %d\n"
+msgstr ""
+
+#: rcs_import.cc:123
+#, c-format
+msgid "Adding file %s version %s to %d\n"
+msgstr ""
+
+#: rcs_import.cc:401
msgid "skipping identity file edge\n"
msgstr ""
-#: rcs_import.cc:378 rcs_import.cc:404
+#: rcs_import.cc:409 rcs_import.cc:435
#, c-format
msgid "existing path to %s found, skipping\n"
msgstr ""
-#: rcs_import.cc:396
+#: rcs_import.cc:427
msgid "skipping identity manifest edge\n"
msgstr ""
-#: rcs_import.cc:456
+#: rcs_import.cc:487
#, c-format
msgid "version %s has %d lines\n"
msgstr ""
-#: rcs_import.cc:461
+#: rcs_import.cc:492
#, c-format
msgid "following RCS edge %s -> %s\n"
msgstr ""
-#: rcs_import.cc:464
+#: rcs_import.cc:495
#, c-format
msgid "constructed RCS version %s, inserting into database\n"
msgstr ""
-#: rcs_import.cc:474
+#: rcs_import.cc:505
#, c-format
msgid "revision %s has no successor\n"
msgstr ""
-#: rcs_import.cc:480
+#: rcs_import.cc:511
#, c-format
msgid "marking %s as not present in older manifests\n"
msgstr ""
-#: rcs_import.cc:498
+#: rcs_import.cc:529
#, c-format
msgid "following RCS branch %s\n"
msgstr ""
-#: rcs_import.cc:513
+#: rcs_import.cc:544
#, c-format
msgid "finished RCS branch %s\n"
msgstr ""
-#: rcs_import.cc:533
+#: rcs_import.cc:564
#, c-format
msgid "parsing RCS file %s\n"
msgstr ""
-#: rcs_import.cc:535
+#: rcs_import.cc:566
#, c-format
msgid "parsed RCS file %s OK\n"
msgstr ""
-#: rcs_import.cc:561
+#: rcs_import.cc:589
#, c-format
msgid "noting head version %s : %s\n"
msgstr ""
-#: rcs_import.cc:646
+#: rcs_import.cc:674
#, c-format
msgid "looking up branch name for %s\n"
msgstr ""
-#: rcs_import.cc:655
+#: rcs_import.cc:683
#, c-format
msgid "version %s has too few components, using branch %s\n"
msgstr ""
-#: rcs_import.cc:673
+#: rcs_import.cc:701
#, c-format
msgid "no branch %s found, using base '%s'\n"
msgstr ""
-#: rcs_import.cc:687
+#: rcs_import.cc:715
#, c-format
msgid "multiple entries (%d) for branch %s found, using: '%s'\n"
msgstr ""
-#: rcs_import.cc:690
+#: rcs_import.cc:718
#, c-format
msgid "unique entry for branch %s found: '%s'\n"
msgstr ""
-#: rcs_import.cc:714
+#: rcs_import.cc:742
#, c-format
msgid "Calculating time of %s\n"
msgstr ""
-#: rcs_import.cc:728
+#: rcs_import.cc:756
#, c-format
msgid "= %i\n"
msgstr ""
-#: rcs_import.cc:751
+#: rcs_import.cc:780
#, c-format
msgid "importing file '%s'\n"
msgstr ""
-#: rcs_import.cc:832
+#: rcs_import.cc:865
#, c-format
msgid "beginning branch %s at %s : %s\n"
msgstr ""
-#: rcs_import.cc:842
+#: rcs_import.cc:875
#, c-format
msgid "moving branch %s back to %s : %s\n"
msgstr ""
-#: rcs_import.cc:864
+#: rcs_import.cc:897
#, c-format
msgid "using existing branchpoint for %s at %s : %s\n"
msgstr ""
-#: rcs_import.cc:906
+#: rcs_import.cc:939
#, c-format
msgid "note_file_edge %s %d -> %s %d\n"
msgstr ""
-#: rcs_import.cc:914
+#: rcs_import.cc:947
#, c-format
msgid "noting trunk edge %s : %s -> %s\n"
msgstr ""
-#: rcs_import.cc:927
+#: rcs_import.cc:960
#, c-format
msgid "noting branch edge %s : %s -> %s\n"
msgstr ""
-#: rcs_import.cc:967
+#: rcs_import.cc:1000
#, c-format
msgid "skipping non-RCS file %s\n"
msgstr ""
-#: rcs_import.cc:984
+#: rcs_import.cc:1018
#, c-format
-msgid "storing manifest %s (base %s)\n"
+msgid "storing trunk manifest %s (base %s)\n"
msgstr ""
-#: rcs_import.cc:988
+#: rcs_import.cc:1020
#, c-format
+msgid "storing branch manifest %s (base %s)\n"
+msgstr ""
+
+#: rcs_import.cc:1024
+#, c-format
msgid "storing trunk head %s\n"
msgstr ""
-#: rcs_import.cc:1002
+#: rcs_import.cc:1038
msgid "skipping null manifest\n"
msgstr ""
-#: rcs_import.cc:1011
+#: rcs_import.cc:1051
#, c-format
msgid "skipping cyclical trunk manifest delta %s -> %s\n"
msgstr ""
-#: rcs_import.cc:1041
+#: rcs_import.cc:1057 rcs_import.cc:1071
#, c-format
+msgid "writing full manifest %s\n"
+msgstr ""
+
+#: rcs_import.cc:1065
+#, c-format
+msgid "skipping cyclical branch manifest delta %s -> %s\n"
+msgstr ""
+
+#: rcs_import.cc:1083
+#, c-format
msgid "storing trunk manifest delta %s -> %s\n"
msgstr ""
-#: rcs_import.cc:1058
+#: rcs_import.cc:1100
#, c-format
msgid "storing branch manifest delta %s -> %s\n"
msgstr ""
-#: rcs_import.cc:1107
+#: rcs_import.cc:1151
#, c-format
msgid "deleting entry state '%s' on '%s'\n"
msgstr ""
-#: rcs_import.cc:1115
+#: rcs_import.cc:1169
#, c-format
msgid "adding entry state '%s' on '%s'\n"
msgstr ""
-#: rcs_import.cc:1120
+#: rcs_import.cc:1174
#, c-format
msgid "skipping preserved entry state '%s' on '%s'\n"
msgstr ""
-#: rcs_import.cc:1125
+#: rcs_import.cc:1179
#, c-format
msgid "applying state delta on '%s' : '%s' -> '%s'\n"
msgstr ""
-#: rcs_import.cc:1131
+#: rcs_import.cc:1185
#, c-format
msgid "logical changeset from parent -> child has %d file state changes\n"
msgstr ""
-#: rcs_import.cc:1262
+#: rcs_import.cc:1307
+#, c-format
+msgid ""
+"%s appears to be a CVS repository root directory\n"
+"try importing a module instead, with 'cvs_import %s/"
+msgstr ""
+
+#: rcs_import.cc:1320
msgid "need base --branch argument for importing"
msgstr ""
-#: rcs_import.cc:1269
+#: rcs_import.cc:1327
#, c-format
msgid "path %s does not exist"
msgstr ""
-#: rcs_import.cc:1271
+#: rcs_import.cc:1329
#, c-format
msgid "path %s is not a directory"
msgstr ""
-#: rcs_import.cc:1274
+#: rcs_import.cc:1332
#, c-format
msgid "could not change directory to %s"
msgstr ""
-#: rcs_import.cc:1279
+#: rcs_import.cc:1337
msgid "phase 1 (version import) complete\n"
msgstr ""
-#: rcs_import.cc:1296
+#: rcs_import.cc:1354
msgid "phase 2 (ancestry reconstruction) complete\n"
msgstr ""
-#: rcs_import.cc:1314
+#: rcs_import.cc:1372
msgid "phase 3 (writing revisions) complete\n"
msgstr ""
-#: revision.cc:111
+#: revision.cc:116
msgid "verifying new revisions (this may take a while)\n"
msgstr ""
-#: revision.cc:113
+#: revision.cc:118
#, c-format
msgid "Verifying revision %s has sane history (to depth %i)\n"
msgstr ""
-#: revision.cc:153
+#: revision.cc:158
#, c-format
msgid "Examining %s -> %s\n"
msgstr ""
-#: revision.cc:226
+#: revision.cc:231
#, c-format
msgid "%s and %s have no common ancestor, so done\n"
msgstr ""
-#: revision.cc:232
+#: revision.cc:237
msgid "already checked common ancestor, so done\n"
msgstr ""
-#: revision.cc:235
+#: revision.cc:240
#, c-format
msgid "%s is a merge; verifying paths to common ancestor %s are sane\n"
msgstr ""
-#: revision.cc:289
+#: revision.cc:294
#, c-format
msgid "loading parents for node %d\n"
msgstr ""
-#: revision.cc:309
+#: revision.cc:314
#, c-format
msgid "parent %s -> node %d\n"
msgstr ""
-#: revision.cc:454
+#: revision.cc:459
#, c-format
msgid "found %d intersecting nodes\n"
msgstr ""
-#: revision.cc:502
+#: revision.cc:507
#, c-format
msgid "searching for common ancestor, left=%s right=%s\n"
msgstr ""
-#: revision.cc:507
+#: revision.cc:512
#, c-format
msgid "common ancestor scan [par=%d,anc=%d,dom=%d]\n"
msgstr ""
-#: revision.cc:512
+#: revision.cc:517
#, c-format
msgid "found node %d, ancestor of left %s and dominating right %s\n"
msgstr ""
-#: revision.cc:519
+#: revision.cc:524
#, c-format
msgid "found node %d, ancestor of right %s and dominating left %s\n"
msgstr ""
-#: revision.cc:550
+#: revision.cc:555
#, c-format
msgid "searching for least common ancestor, left=%s right=%s\n"
msgstr ""
-#: revision.cc:554
+#: revision.cc:559
#, c-format
msgid "least common ancestor scan [par=%d,anc=%d]\n"
msgstr ""
-#: revision.cc:559
+#: revision.cc:564
#, c-format
msgid "found node %d, ancestor of left %s and right %s\n"
msgstr ""
-#: revision.cc:613
+#: revision.cc:618
#, c-format
msgid "checking whether %s is an ancestor of %s\n"
msgstr ""
-#: revision.cc:723
+#: revision.cc:728
#, c-format
msgid "new root: %s\n"
msgstr ""
-#: revision.cc:733
+#: revision.cc:738
#, c-format
msgid "new leaf: %s\n"
msgstr ""
-#: revision.cc:875
+#: revision.cc:880
#, c-format
msgid "exploring changesets from parents of %s, seeking towards %s\n"
msgstr ""
-#: revision.cc:888
+#: revision.cc:893
#, c-format
msgid "considering parent %s of %s\n"
msgstr ""
-#: revision.cc:914
+#: revision.cc:919
#, c-format
msgid "revision %s is relevant, composing with edge to %s\n"
msgstr ""
-#: revision.cc:921
+#: revision.cc:926
#, c-format
msgid "parent %s of %s is not relevant\n"
msgstr ""
-#: revision.cc:957
+#: revision.cc:962
#, c-format
msgid "adding parents of %s to subgraph\n"
msgstr ""
-#: revision.cc:967
+#: revision.cc:972
#, c-format
msgid "found parent %s of %s\n"
msgstr ""
-#: revision.cc:971
+#: revision.cc:976
#, c-format
msgid "adding parent %s to next frontier\n"
msgstr ""
-#: revision.cc:986
+#: revision.cc:991
#, c-format
msgid "calculating composite changeset between %s and %s\n"
msgstr ""
-#: revision.cc:1004
+#: revision.cc:1009
#, c-format
msgid "calculating changeset from %s to %s\n"
msgstr ""
-#: revision.cc:1008
+#: revision.cc:1013
#, c-format
msgid "no common ancestor for %s and %s\n"
msgstr ""
-#: revision.cc:1009
+#: revision.cc:1014
#, c-format
msgid "common ancestor is %s\n"
msgstr ""
-#: revision.cc:1040
+#: revision.cc:1045
#, c-format
msgid "analyzing manifest changes from '%s' -> '%s'\n"
msgstr ""
-#: revision.cc:1053
+#: revision.cc:1058
#, c-format
msgid "splitting ancestry for file %s\n"
msgstr ""
-#: revision.cc:1120
+#: revision.cc:1125
#, c-format
msgid "noting ancestry from child %d -> parent %d\n"
msgstr ""
-#: revision.cc:1154
+#: revision.cc:1159
#, c-format
msgid "setting epoch for %s to %s\n"
msgstr ""
-#: revision.cc:1210
+#: revision.cc:1215
msgid "scanning for nodes with 3+ parents\n"
msgstr ""
-#: revision.cc:1251
+#: revision.cc:1256
#, c-format
msgid "optimizing out redundant edge %i -> %i\n"
msgstr ""
-#: revision.cc:1278
+#: revision.cc:1283
#, c-format
msgid "rebuilding %d nodes\n"
msgstr ""
-#: revision.cc:1315
+#: revision.cc:1320
#, c-format
msgid "node %d = manifest %s\n"
msgstr ""
-#: revision.cc:1326
+#: revision.cc:1331
#, c-format
msgid "loaded '%s' manifest cert for node %s\n"
msgstr ""
-#: revision.cc:1354
+#: revision.cc:1359
#, c-format
msgid "node %d = revision %s = manifest %s\n"
msgstr ""
-#: revision.cc:1366
+#: revision.cc:1371
#, c-format
msgid "loaded '%s' revision cert for node %s\n"
msgstr ""
-#: revision.cc:1390
+#: revision.cc:1395
#, c-format
msgid "processing node %d\n"
msgstr ""
-#: revision.cc:1394
+#: revision.cc:1399
#, c-format
msgid "node %d already processed, skipping\n"
msgstr ""
-#: revision.cc:1408
+#: revision.cc:1413
#, c-format
msgid "node %d is a root node\n"
msgstr ""
-#: revision.cc:1424 revision.cc:1507
+#: revision.cc:1429 revision.cc:1512
#, c-format
msgid "parent node %d = revision %s\n"
msgstr ""
-#: revision.cc:1486
+#: revision.cc:1491
#, c-format
msgid "processing edge from child %d -> parent %d\n"
msgstr ""
-#: revision.cc:1524
+#: revision.cc:1529
#, c-format
msgid "mapped node %d to revision %s\n"
msgstr ""
-#: revision.cc:1530
+#: revision.cc:1535
#, c-format
msgid "skipping already existing revision %s\n"
msgstr ""
-#: revision.cc:1542
+#: revision.cc:1547
msgid "rebuilding revision graph from existing graph\n"
msgstr ""
-#: revision.cc:1575
+#: revision.cc:1580
msgid "rebuilding revision graph from manifest certs\n"
msgstr ""
@@ -3787,32 +3822,49 @@
msgid "started up on %s\n"
msgstr ""
-#: transforms.cc:502
+#: transforms.cc:511
#, c-format
msgid "converting %d bytes from %s to %s\n"
msgstr ""
-#: transforms.cc:554
+#: transforms.cc:517
#, c-format
+msgid "failed to convert string from %s to %s: '%s'"
+msgstr ""
+
+#: transforms.cc:565
+#, c-format
msgid "converting %d bytes from IDNA ACE to UTF-8\n"
msgstr ""
-#: transforms.cc:557 transforms.cc:571
+#: transforms.cc:568 transforms.cc:582
#, c-format
msgid "error converting %d UTF-8 bytes to IDNA ACE: %s"
msgstr ""
-#: transforms.cc:568
+#: transforms.cc:579
#, c-format
msgid "converting %d bytes from UTF-8 to IDNA ACE\n"
msgstr ""
-#: transforms.cc:711
+#: transforms.cc:833
#, c-format
msgid "doing linesep conversion to %s\n"
msgstr ""
-#: transforms.cc:995
+#: transforms.cc:937
+msgid "trying to end a brace expression in a glob when none is started"
+msgstr ""
+
+#: transforms.cc:966
+msgid "run-away bracket expression in glob"
+msgstr ""
+
+#: transforms.cc:968
+msgid "run-away brace expression in glob"
+msgstr ""
+
+#: transforms.cc:1243
#, c-format
msgid "ACE-encoded %s: '%s'\n"
msgstr ""
@@ -3846,132 +3898,222 @@
msgid "cannot determine branch for update"
msgstr ""
-#: vocab.cc:36
+#: vocab.cc:57
#, c-format
msgid "hex encoded ID '%s' size != %d"
msgstr ""
-#: vocab.cc:39
+#: vocab.cc:60
#, c-format
msgid "bad character '%c' in id name '%s'"
msgstr ""
-#: vocab.cc:52
+#: vocab.cc:73
#, c-format
msgid "bad character '%c' in ace string '%s'"
msgstr ""
-#: vocab.cc:66
+#: vocab.cc:87
#, c-format
msgid "bad character '%c' in cert name '%s'"
msgstr ""
-#: vocab.cc:79
+#: vocab.cc:100
#, c-format
msgid "bad character '%c' in key name '%s'"
msgstr ""
-#: vocab.cc:111
+#: vocab.cc:130
#, c-format
msgid "prohibited absolute path '%s'"
msgstr ""
-#: vocab.cc:116
+#: vocab.cc:135
#, c-format
msgid "empty path component in '%s'"
msgstr ""
-#: vocab.cc:119
+#: vocab.cc:138
#, c-format
msgid "prohibited path component '%s' in '%s'"
msgstr ""
-#: vocab.cc:123
+#: vocab.cc:142
#, c-format
msgid "bad character '%d' in path component '%s' of '%s'"
msgstr ""
-#: vocab.cc:129
+#: vocab.cc:148
#, c-format
msgid "null byte in path component '%s' of '%s'"
msgstr ""
-#: vocab.cc:149
+#: vocab.cc:203
#, c-format
msgid "prohibited book-keeping path in '%s'"
msgstr ""
-#: work.cc:46
+#: work.cc:57
#, c-format
msgid "skipping ignorable file %s\n"
msgstr ""
-#: work.cc:52
+#: work.cc:63
#, c-format
msgid "skipping %s, already accounted for in working copy\n"
msgstr ""
-#: work.cc:56
+#: work.cc:67
#, c-format
msgid "adding %s to working copy add set\n"
msgstr ""
-#: work.cc:78 work.cc:127
+#: work.cc:95 work.cc:201
msgid "invalid path ''"
msgstr ""
-#: work.cc:80
+#: work.cc:97
#, c-format
msgid "path %s does not exist\n"
msgstr ""
-#: work.cc:131 work.cc:170
+#: work.cc:134
#, c-format
+msgid "adding attribute '%s' to file %s to .mt_attrs\n"
+msgstr ""
+
+#: work.cc:205
+#, c-format
msgid "skipping %s, not currently tracked\n"
msgstr ""
-#: work.cc:135
+#: work.cc:209
#, c-format
msgid "adding %s to working copy delete set\n"
msgstr ""
-#: work.cc:139
+#: work.cc:213
msgid "SORRY -- 'drop somedir' is not going to work.\n"
msgstr ""
-#: work.cc:140
+#: work.cc:214
msgid "Revert and try 'find somedir -type f | xargs monotone drop'\n"
msgstr ""
-#: work.cc:158
+#: work.cc:225
+#, c-format
+msgid "dropped attributes for file %s from .mt_attrs\n"
+msgstr ""
+
+#: work.cc:248
msgid "invalid source path ''"
msgstr ""
-#: work.cc:159
+#: work.cc:249
msgid "invalid destination path ''"
msgstr ""
-#: work.cc:174
+#: work.cc:260
#, c-format
+msgid "%s does not exist in current revision\n"
+msgstr ""
+
+#: work.cc:263
+#, c-format
+msgid "%s already exists in current revision\n"
+msgstr ""
+
+#: work.cc:265
+#, c-format
msgid "adding %s -> %s to working copy rename set\n"
msgstr ""
-#: work.cc:204
+#: work.cc:285
#, c-format
+msgid "%s has existing attributes in .mt-attrs; clean them up first"
+msgstr ""
+
+#: work.cc:294
+#, c-format
+msgid "moving attributes for %s to %s\n"
+msgstr ""
+
+#: work.cc:313
+#, c-format
+msgid "work path is %s\n"
+msgstr ""
+
+#: work.cc:322
+#, c-format
+msgid "checking for un-committed work file %s\n"
+msgstr ""
+
+#: work.cc:326
+#, c-format
+msgid "read rearrangement from %s\n"
+msgstr ""
+
+#: work.cc:330
+#, c-format
+msgid "no un-committed work file %s\n"
+msgstr ""
+
+#: work.cc:367
+#, c-format
+msgid "revision path is %s\n"
+msgstr ""
+
+#: work.cc:377
+#, c-format
+msgid "working copy is corrupt: %s does not exist\n"
+msgstr ""
+
+#: work.cc:380
+#, c-format
+msgid "loading revision id from %s\n"
+msgstr ""
+
+#: work.cc:389
+#, c-format
+msgid "writing revision id to %s\n"
+msgstr ""
+
+#: work.cc:408
+#, c-format
+msgid "base revision %s does not exist in database\n"
+msgstr ""
+
+#: work.cc:411
+#, c-format
+msgid "old manifest is %s\n"
+msgstr ""
+
+#: work.cc:414
+#, c-format
+msgid "base manifest %s does not exist in database\n"
+msgstr ""
+
+#: work.cc:419
+#, c-format
+msgid "old manifest has %d entries\n"
+msgstr ""
+
+#: work.cc:440
+#, c-format
msgid "user log path is %s\n"
msgstr ""
-#: work.cc:244
+#: work.cc:480
#, c-format
msgid "options path is %s\n"
msgstr ""
-#: work.cc:291
+#: work.cc:527
#, c-format
msgid "local dump path is %s\n"
msgstr ""
-#: work.cc:338
+#: work.cc:583
#, c-format
msgid "attribute map path is %s\n"
msgstr ""
--- testsuite.at
+++ testsuite.at
@@ -151,6 +151,17 @@
AT_CHECK($2, [], [expout], [ignore])
])
+# run as CHECK_SAME_CANONICALISED_STDOUT(command1, command2)
+m4_define([CHECK_SAME_CANONICALISED_STDOUT], [
+AT_CHECK($1, [], [stdout], [ignore])
+AT_CHECK(mv stdout output1)
+AT_CHECK(CANONICALISE(output1))
+AT_CHECK($2, [], [stdout], [ignore])
+AT_CHECK(mv stdout output2)
+AT_CHECK(CANONICALISE(output2))
+AT_CHECK(cmp output1 output2)
+])
+
# run as CHECK_DIFFERENT_STDOUT(command1, command2)
m4_define([CHECK_DIFFERENT_STDOUT], [
AT_CHECK($1, [], [stdout], [ignore])