You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2012/03/30 15:55:31 UTC
svn commit: r1307424 [7/11] - in /subversion/branches/revprop-packing: ./
build/ac-macros/ notes/ notes/directory-index/ notes/wc-ng/
subversion/bindings/javahl/ subversion/bindings/swig/python/svn/
subversion/bindings/swig/python/tests/ subversion/bin...
Modified: subversion/branches/revprop-packing/subversion/po/de.po
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/po/de.po?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/po/de.po [UTF-8] (original)
+++ subversion/branches/revprop-packing/subversion/po/de.po [UTF-8] Fri Mar 30 13:55:26 2012
@@ -4604,9 +4604,9 @@ msgid "<<< Started new transaction, base
msgstr "<<< Neue Transaktion basierend auf Originalrevision %ld gestartet\n"
#: ../libsvn_repos/deprecated.c:648 ../svnadmin/main.c:781
-#, fuzzy, c-format
+#, c-format
msgid " removing '\\r' from %s ..."
-msgstr "Entferne »%s« aus Änderungsliste »%s«."
+msgstr " Entferne »\\r« aus %s ..."
#: ../libsvn_repos/dump.c:353
#, c-format
@@ -4620,14 +4620,14 @@ msgstr ""
"WARNUNG: leeres Projektarchiv wird fehlschlagen.\n"
#: ../libsvn_repos/dump.c:457
-#, fuzzy, c-format
+#, c-format
msgid ""
"WARNING: Mergeinfo referencing revision(s) prior to the oldest dumped revision (%ld).\n"
"WARNING: Loading this dump may result in invalid mergeinfo.\n"
msgstr ""
-"WARNUNG: Verweis auf Daten in Revision %ld, welche älter als die älteste\n"
-"WARNUNG: ausgegebene Revision (%ld) ist. Das Laden diese Datei in ein\n"
-"WARNUNG: leeres Projektarchiv wird fehlschlagen.\n"
+"WARNUNG: Zusammenführungsinformationen verweisen auf Revision(en) vor der ältesten\n"
+"WARNUNG: ausgegebene Revision (%ld). Das Laden dieser Datei kann ungültige\n"
+"WARNUNG: Zusammenführungsinformationen zur Folge haben.\n"
#: ../libsvn_repos/dump.c:979 ../libsvn_repos/dump.c:1235
#, c-format
@@ -5641,19 +5641,19 @@ msgid "First line of '%s' contains non-d
msgstr "Die erste Zeile von »%s« enthält eine Nicht-Ziffer"
#: ../libsvn_subr/io.c:3690
-#, fuzzy, c-format
+#, c-format
msgid "Can't create temporary file from template '%s'"
-msgstr "Kann »Pipe« für Aktion »%s« nicht anlegen"
+msgstr "Kann temporäre Datei von Vorlage »%s« nicht anlegen"
#: ../libsvn_subr/io.c:3781
-#, fuzzy, c-format
+#, c-format
msgid "Can't set aside '%s'"
-msgstr "Kann Status von »%s« nicht ermitteln"
+msgstr "Kann »%s« nicht beiseitelegen"
#: ../libsvn_subr/io.c:3793
-#, fuzzy, c-format
+#, c-format
msgid "Unable to make name in '%s'"
-msgstr "Kann Namen für »%s« nicht erstellen"
+msgstr "Kann Namen in »%s« nicht erstellen"
#: ../libsvn_subr/kitchensink.c:46
#, c-format
@@ -5921,11 +5921,8 @@ msgstr "Bitte geben Sie »ja« oder »ne
msgid "Store password unencrypted (yes/no)? "
msgstr "Passwort unverschlüsselt speichern (ja/nein)? "
-# CHECKME: See
-# http://dict.leo.org/forum/viewUnsolvedquery.php?idThread=34212&idForum=2&lp=ende&lang=de
-# CHECKME: Remove ":", it's no proper sentence with it
#: ../libsvn_subr/prompt.c:448
-#, fuzzy, c-format
+#, c-format
msgid ""
"\n"
"-----------------------------------------------------------------------\n"
@@ -5942,12 +5939,13 @@ msgid ""
"'%s'.\n"
"-----------------------------------------------------------------------\n"
msgstr ""
+"\n"
"-----------------------------------------------------------------------\n"
-"ACHTUNG! Ihr Password für den Anmeldungstext (realm)\n"
+"ACHTUNG! Ihr Password für den Anmeldebereich\n"
"\n"
" %s\n"
"\n"
-"kann auf der Platte nur unverschlüsselt gespeichert werden! Es wird\n"
+"kann auf der Festplatte nur unverschlüsselt gespeichert werden! Es wird\n"
"empfohlen, falls möglich Ihr System so zu konfigurieren, dass Subversion\n"
"Passwörter verschlüsselt speichern kann. Siehe die Dokumentation für\n"
"Details.\n"
@@ -5955,16 +5953,15 @@ msgstr ""
"Sie können ein weiteres Anzeigen dieser Warnung verhindern, indem Sie\n"
"den Wert der Option »store-plaintext-passwords« in\n"
"»%s«\n"
-"entweder auf »ja« oder »nein« setzen.\n"
+"entweder auf »yes« oder »no« setzen.\n"
"-----------------------------------------------------------------------\n"
#: ../libsvn_subr/prompt.c:475
msgid "Store passphrase unencrypted (yes/no)? "
msgstr "Passphrase unverschlüsselt speichern (ja/nein)? "
-# FIXME: s/passphrase/passphrases/
#: ../libsvn_subr/prompt.c:477
-#, fuzzy, c-format
+#, c-format
msgid ""
"\n"
"-----------------------------------------------------------------------\n"
@@ -5981,12 +5978,13 @@ msgid ""
"'no' in '%s'.\n"
"-----------------------------------------------------------------------\n"
msgstr ""
+"\n"
"-----------------------------------------------------------------------\n"
"ACHTUNG! Ihre Passphrase für das Klient-Zertifikat:\n"
"\n"
" %s\n"
"\n"
-"kann auf der Platte nur unverschlüsselt gespeichert werden! Es wird\n"
+"kann auf der Festplatte nur unverschlüsselt gespeichert werden! Es wird\n"
"empfohlen, falls möglich Ihr System so zu konfigurieren, dass Subversion\n"
"Passphrasen verschlüsselt speichern kann. Siehe die Dokumentation für\n"
"Details.\n"
@@ -5994,7 +5992,7 @@ msgstr ""
"Sie können ein weiteres Anzeigen dieser Warnung verhindern, indem Sie\n"
"den Wert der Option »store-ssl-client-cert-pp-plaintext« in\n"
"»%s«\n"
-"entweder auf »ja« oder »nein« setzen.\n"
+"entweder auf »yes« oder »no« setzen.\n"
"-----------------------------------------------------------------------\n"
#: ../libsvn_subr/prompt.c:523
@@ -6078,9 +6076,9 @@ msgid " (%a, %d %b %Y)"
msgstr " (%a, %d. %b %Y)"
#: ../libsvn_subr/token.c:66
-#, fuzzy, c-format
+#, c-format
msgid "Token '%s' is unrecognized"
-msgstr "Marke »%s« hat einen nicht erkannten Knotentyp"
+msgstr "Marke »%s« nicht erkannt"
#: ../libsvn_subr/utf.c:190
msgid "Can't lock charset translation mutex"
@@ -6169,32 +6167,32 @@ msgid "Malformed XML: %s at line %ld"
msgstr "Fehlerhaftes XML: %s in Zeile %ld"
#: ../libsvn_wc/adm_crawler.c:114
-#, fuzzy, c-format
+#, c-format
msgid "The existing node '%s' can not be restored."
-msgstr "Der Knoten »%s« wurde nicht gefunden."
+msgstr "Der vorhandene Knoten »%s« kann nicht wiederhergestellt werden."
#: ../libsvn_wc/adm_crawler.c:141
-#, fuzzy, c-format
+#, c-format
msgid "The node '%s' can not be restored."
-msgstr "Der Knoten »%s« wurde nicht gefunden."
+msgstr "Der Knoten »%s« kann nicht wiederhergestellt werden."
#: ../libsvn_wc/adm_crawler.c:724
-#, fuzzy, c-format
+#, c-format
msgid "Can't retrieve base revision for %s"
-msgstr "alle Revisionseigenschaften abfragen"
+msgstr "Kann Basisrevision für »%s« nicht abfragen"
#: ../libsvn_wc/adm_crawler.c:999
msgid "Error aborting report"
msgstr "Fehler beim Abbrechen des Reports"
#: ../libsvn_wc/adm_crawler.c:1274
-#, fuzzy, c-format
+#, c-format
msgid ""
"Checksum mismatch for text base of '%s':\n"
" expected: %s\n"
" actual: %s\n"
msgstr ""
-"Prüfsummenfehler, Datei »%s«:\n"
+"Prüfsummenfehler für Textbasis von »%s«:\n"
" Erwartet: %s\n"
" Tatsächlich: %s\n"
@@ -6211,23 +6209,22 @@ msgstr "»%s« ist kein gültiger Verwal
#: ../libsvn_wc/adm_files.c:208
#, c-format
msgid "Node '%s' has no pristine text"
-msgstr ""
+msgstr "Knoten »%s« hat keinen Ursprungstext"
-# TODO: proper translation for Baseline
#: ../libsvn_wc/adm_files.c:234
-#, fuzzy, c-format
+#, c-format
msgid "Node '%s' has no pristine base text"
-msgstr "»%s« existierte nicht für die Baseline-Ressource"
+msgstr "Knoten »%s« hat keine ursprüngliche Textbasis"
#: ../libsvn_wc/adm_files.c:259
-#, fuzzy, c-format
+#, c-format
msgid "File '%s' has no text base"
-msgstr "Datei »%s« hat inkonsistente Zeilenenden"
+msgstr "Datei »%s« hat keine Textbasis"
#: ../libsvn_wc/adm_files.c:286
-#, fuzzy, c-format
+#, c-format
msgid "Base node of '%s' is not a file"
-msgstr "Pfad »%s« ist keine Datei"
+msgstr "Basisknoten von »%s« ist keine Datei"
#: ../libsvn_wc/adm_files.c:322
#, c-format
@@ -6255,16 +6252,14 @@ msgid "URL '%s' doesn't match existing U
msgstr "URL »%s« stimmt nicht mit der existierenden URL »%s« in »%s« überein"
#: ../libsvn_wc/adm_ops.c:625
-#, fuzzy, c-format
+#, c-format
msgid "'%s' cannot be deleted"
-msgstr "Das Basisverzeichnis kann nicht gelöscht werden"
+msgstr "»%s« kann nicht gelöscht werden"
#: ../libsvn_wc/adm_ops.c:795 ../libsvn_wc/update_editor.c:5607
-#, fuzzy, c-format
+#, c-format
msgid "Can't find parent directory's node while trying to add '%s'"
-msgstr ""
-"Kann Eintrag des Elternverzeichnisses während des Hinzufügens von »%s« nicht\n"
-"finden"
+msgstr "Kann Knoten des Elternverzeichnisses während des Hinzufügens von »%s« nicht finden"
#: ../libsvn_wc/adm_ops.c:804 ../libsvn_wc/update_editor.c:5601
#, c-format
@@ -6326,12 +6321,12 @@ msgstr "Die Datei »%s« hat lokale Änd
#: ../libsvn_wc/adm_ops.c:2087
#, c-format
msgid "'%s' is a directory, and thus cannot be a member of a changelist"
-msgstr "»%s« ist ein Vrzeichnis and kann deswegen nicht Element einer Änderungsliste sein"
+msgstr "»%s« ist ein Verzeichnis and kann deswegen nicht Element einer Änderungsliste sein"
#: ../libsvn_wc/adm_ops.c:2155
-#, fuzzy, c-format
+#, c-format
msgid "Can't add a file external to '%s' as it is not a file in repository '%s'."
-msgstr "Ein externer Dateiverweis von »%s« kann nicht in die Arbeitskopie eines anderen Projektarchivs mit der Wurzel »%s« eingefügt werden"
+msgstr "Kann externen Dateiverweis auf »%s« nicht hinzufügen, da dies keine Datei im Projektarchiv »%s« ist."
#: ../libsvn_wc/cleanup.c:58
#, c-format
@@ -6357,9 +6352,9 @@ msgid "Source '%s' is unexpected kind"
msgstr "Quelle »%s« ist unbekannten Typs"
#: ../libsvn_wc/copy.c:384
-#, fuzzy, c-format
+#, c-format
msgid "cannot handle node kind for '%s'"
-msgstr "»%s« hat einen unbekannten Knotentyp"
+msgstr "Kann Knotentyp für »%s« nicht verarbeiten"
#: ../libsvn_wc/copy.c:648
#, c-format
@@ -6374,9 +6369,9 @@ msgid "Cannot copy to '%s' as it is sche
msgstr "Kann nach »%s« kopieren, da es zum Löschen vorgesehen ist"
#: ../libsvn_wc/copy.c:685
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is already under version control but is excluded."
-msgstr "»%s« befindet sich bereits unter Versionskontrolle"
+msgstr "»%s« befindet sich bereits unter Versionskontrolle, ist aber ausgeschlossen."
#: ../libsvn_wc/copy.c:700
#, c-format
@@ -6389,24 +6384,24 @@ msgid "'%s' already exists and is in the
msgstr "»%s« existiert bereits und ist im Weg"
#: ../libsvn_wc/crop.c:224
-#, fuzzy, c-format
+#, c-format
msgid "Cannot exclude '%s': it is a working copy root"
-msgstr "Erwartete nicht, dass »%s« Basis einer Arbeitskopie ist"
+msgstr "Kann »%s« nicht ausschließen: Es ist die Basis einer Arbeitskopie"
#: ../libsvn_wc/crop.c:232
-#, fuzzy, c-format
+#, c-format
msgid "Cannot exclude '%s': it is a switched path"
-msgstr "Kann »%s« nicht beschneiden: Es ist ein umgestellter Pfad"
+msgstr "Kann »%s« nicht ausschließen: Es ist ein umgestellter Pfad"
#: ../libsvn_wc/crop.c:256
-#, fuzzy, c-format
+#, c-format
msgid "Cannot exclude '%s': it is to be added to the repository. Try commit instead"
-msgstr "Kann »%s« nicht beschneiden: Es soll vom Projektarchiv entfernt werden. Versuchen Sie stattdessen es zu übertragen"
+msgstr "Kann »%s« nicht ausschließen: Es soll dem Projektarchiv hinzugefügt werden. Versuchen Sie stattdessen es zu übertragen"
#: ../libsvn_wc/crop.c:263
-#, fuzzy, c-format
+#, c-format
msgid "Cannot exclude '%s': it is to be deleted from the repository. Try commit instead"
-msgstr "Kann »%s« nicht beschneiden: Es soll vom Projektarchiv entfernt werden. Versuchen Sie stattdessen es zu übertragen"
+msgstr "Kann »%s« nicht ausschließen: Es soll aus dem Projektarchiv entfernt werden. Versuchen Sie stattdessen es zu übertragen"
# CHECKME: Check translation of crop (beschneiden?)!!!!
#: ../libsvn_wc/crop.c:333
@@ -6423,9 +6418,9 @@ msgid "Cannot crop '%s': it is going to
msgstr "Kann »%s« nicht beschneiden: Es soll vom Projektarchiv entfernt werden. Versuchen Sie stattdessen es zu übertragen"
#: ../libsvn_wc/crop.c:366
-#, fuzzy, c-format
+#, c-format
msgid "Cannot crop '%s': it is to be added to the repository. Try commit instead"
-msgstr "Kann »%s« nicht beschneiden: Es soll vom Projektarchiv entfernt werden. Versuchen Sie stattdessen es zu übertragen"
+msgstr "Kann »%s« nicht beschneiden: Es soll dem Projektarchiv hinzugefügt werden. Versuchen Sie stattdessen es zu übertragen"
#: ../libsvn_wc/deprecated.c:2052
#, c-format
@@ -6438,14 +6433,14 @@ msgid "'%s' is not a versioned working c
msgstr "»%s« ist keine versionierte Arbeitskopie"
#: ../libsvn_wc/entries.c:1394
-#, fuzzy, c-format
+#, c-format
msgid "Admin area of '%s' is missing"
-msgstr "Verzeichnis »%s« fehlt"
+msgstr "Administrativer Bereich von »%s« fehlt"
#: ../libsvn_wc/entries.c:1414
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not of the right kind"
-msgstr "»%s« ist veraltet"
+msgstr "»%s« hat einen falschen Typ"
#: ../libsvn_wc/entries.c:2143
#, c-format
@@ -6468,11 +6463,9 @@ msgid "Path '%s' ends in '%s', which is
msgstr "Pfad »%s« endet mit »%s«, was für diese Operation nicht erlaubt ist"
#: ../libsvn_wc/lock.c:553 ../libsvn_wc/upgrade.c:1266
-#, fuzzy, c-format
+#, c-format
msgid "Working copy format of '%s' is too old (%d); please run 'svn upgrade'"
-msgstr ""
-"Format der Arbeitskopie »%s« ist zu alt (%d); bitte checken Sie die\n"
-"Arbeitskopie erneut aus"
+msgstr "Format der Arbeitskopie »%s« ist zu alt (%d); Bitte führen Sie »svn upgrade« aus"
#: ../libsvn_wc/lock.c:817 ../libsvn_wc/wc_db.c:8585
#, c-format
@@ -6490,9 +6483,9 @@ msgid "Expected '%s' to be a directory b
msgstr "Erwartete, dass »%s« ein Verzeichnis ist, es ist aber eine Datei"
#: ../libsvn_wc/lock.c:991
-#, fuzzy, c-format
+#, c-format
msgid "Can't retrieve an access baton for non-directory '%s'"
-msgstr "Kann keine Einträge aus einem nicht-Verzeichnis lesen"
+msgstr "Kann keine Zugriffsreferenz für nicht-Verzeichnis »%s« erhalten"
#: ../libsvn_wc/lock.c:1000
#, c-format
@@ -6510,9 +6503,9 @@ msgid "No write-lock in '%s'"
msgstr "Keine Schreibsperre in »%s«"
#: ../libsvn_wc/lock.c:1564 ../libsvn_wc/lock.c:1615
-#, fuzzy, c-format
+#, c-format
msgid "Can't obtain lock on non-directory '%s'."
-msgstr "Kann Verzeichnis »%s« nicht öffnen"
+msgstr "Kann keine Sperre für nicht-Verzeichnis »%s« erhalten."
# CHECKME: s/callback/hook/ ??
#: ../libsvn_wc/merge.c:866 ../libsvn_wc/merge.c:1139
@@ -6549,7 +6542,7 @@ msgstr "Ungültiger Wert für Feld »%s�
#: ../libsvn_wc/old-and-busted.c:346
#, c-format
msgid "Found an unexpected \\0 in the file external '%s'"
-msgstr "Ein nicht geschütztes \\0 wurde im externen Dateiverweis »%s« gefunden"
+msgstr "Ein nicht erwartetes \\0 wurde im externen Dateiverweis »%s« gefunden"
#: ../libsvn_wc/old-and-busted.c:390
#, c-format
@@ -6567,14 +6560,14 @@ msgid "Entry for '%s' has invalid reposi
msgstr "Eintrag »%s« hat eine ungültige Projektarchiv-Basis"
#: ../libsvn_wc/old-and-busted.c:530 ../libsvn_wc/old-and-busted.c:867
-#, fuzzy, c-format
+#, c-format
msgid "Entry '%s' has invalid 'schedule' value"
-msgstr "Eintrag »%s« hat einen ungültigen »%s« Wert"
+msgstr "Eintrag »%s« hat einen ungültigen Wert für »schedule«"
#: ../libsvn_wc/old-and-busted.c:680
-#, fuzzy, c-format
+#, c-format
msgid "Entry '%s' has invalid 'depth' value"
-msgstr "Eintrag »%s« hat einen ungültigen »%s« Wert"
+msgstr "Eintrag »%s« hat einen ungültigen Wert für »depth«"
#: ../libsvn_wc/old-and-busted.c:731
#, c-format
@@ -6617,9 +6610,9 @@ msgid "Error at entry %d in entries file
msgstr "Fehler bei Eintrag %d in Eintragsdatei für »%s«:"
#: ../libsvn_wc/props.c:283
-#, fuzzy, c-format
+#, c-format
msgid "The property '%s' may not be merged into '%s'."
-msgstr "Eigenschaft »%s« wurde von »%s« gelöscht.\n"
+msgstr "Eigenschaft »%s« darf nicht nach »%s« zusammengeführt werden."
#: ../libsvn_wc/props.c:427
#, c-format
@@ -6640,34 +6633,34 @@ msgstr ""
"aber die Eigenschaft wurde lokal bereits gelöscht."
#: ../libsvn_wc/props.c:451
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to delete property '%s' with value '%s',\n"
"but property has been locally added with value '%s'."
msgstr ""
-"Versuch, die Eigenschaft »%s« von »%s« in »%s« zu ändern,\n"
+"Versuch, die Eigenschaft »%s« mit dem Wert »%s« zu löschen,\n"
"aber die Eigenschaft wurde lokal mit dem Wert »%s« hinzugefügt."
#: ../libsvn_wc/props.c:468
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to delete property '%s' with value '%s',\n"
"but it has been modified from '%s' to '%s'."
msgstr ""
"Versuch, die Eigenschaft »%s« mit dem Wert »%s« zu löschen,\n"
-"aber der Wert wurde von »%s« in »%s« geändert."
+"aber der Wert wurde von »%s« nach »%s« geändert."
#: ../libsvn_wc/props.c:479
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to delete property '%s' with value '%s',\n"
"but property with value '%s' is locally deleted."
msgstr ""
-"Versuch, die Eigenschaft »%s« mit dem Wert »%s« anzulegen,\n"
-"aber die Eigenschaft wurde lokal bereits gelöscht."
+"Versuch, die Eigenschaft »%s« mit dem Wert »%s« zu löschen,\n"
+"aber die Eigenschaft mit dem Wert »%s« wurde lokal gelöscht."
#: ../libsvn_wc/props.c:491
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to delete property '%s' with value '%s',\n"
"but the local value is '%s'."
@@ -6735,9 +6728,8 @@ msgid "Property '%s' is an entry propert
msgstr "Eigenschaft »%s« ist eine Eintragseigenschaft"
#: ../libsvn_wc/props.c:1804 ../libsvn_wc/props.c:1811
-#, fuzzy
msgid "Failed to load properties"
-msgstr "Konnte Eigenschaften nicht vom Datenträger laden"
+msgstr "Konnte Eigenschaften nicht laden"
#: ../libsvn_wc/props.c:1853
#, c-format
@@ -6765,19 +6757,18 @@ msgid "Can't set properties on '%s': inv
msgstr ""
#: ../libsvn_wc/props.c:2063
-#, fuzzy
msgid "Failed to load current properties"
-msgstr "Konnte Eigenschaften nicht vom Datenträger laden"
+msgstr "Konnte aktuelle Eigenschaften nicht laden"
#: ../libsvn_wc/props.c:2208
-#, fuzzy, c-format
+#, c-format
msgid "Unrecognized line ending style '%s' for '%s'"
-msgstr "Stil für Zeilenende für »%s« nicht erkannt"
+msgstr "Stil für Zeilenende »%s« nicht erkannt für »%s«"
#: ../libsvn_wc/props.c:2267
-#, fuzzy, c-format
+#, c-format
msgid "Cannot set non-inheritable mergeinfo on a non-directory ('%s')"
-msgstr "Kann »%s« nicht für ein Verzeichnis setzen (»%s«)"
+msgstr "Kann nicht-vererbbare Zusammenführungsinformationen auf ein nicht-Verzeichnis (»%s«) nicht setzen"
#: ../libsvn_wc/props.c:2488 ../libsvn_wc/props.c:2564
#, c-format
@@ -6805,32 +6796,29 @@ msgid "Invalid %s property on '%s': targ
msgstr "Ungültige Eigenschaft %s auf »%s«: Ziel »%s« ist ein absoluter Pfad oder enthält »..«"
#: ../libsvn_wc/questions.c:203
-#, fuzzy, c-format
+#, c-format
msgid ""
"Checksum mismatch indicates corrupt text base for file: '%s':\n"
" expected: %s\n"
" actual: %s\n"
msgstr ""
-"Prüfsummenfehler ist Anzeichen für beschädigte Textbasis: »%s«\n"
+"Prüfsummenfehler ist Anzeichen für beschädigte Textbasis der Datei: »%s«\n"
" Erwartet: %s\n"
" Tatsächlich: %s\n"
#: ../libsvn_wc/relocate.c:105
-#, fuzzy, c-format
+#, c-format
msgid "Cannot relocate '%s' as it is not the root of a working copy"
-msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten"
+msgstr "Kann »%s« nicht umplatzieren da es keine Basis einer Arbeitskopie ist"
#: ../libsvn_wc/relocate.c:112
-#, fuzzy, c-format
+#, c-format
msgid "Cannot relocate '%s' as it is not the root of a working copy; try relocating '%s' instead"
-msgstr ""
-"Kann »%s« nicht kopieren oder verschieben, da es sich noch nicht im\n"
-"Projektarchiv befindet, versuchen Sie es zuerst zu übertragen"
+msgstr "Kann »%s« nicht umplatzieren da es keine Basis einer Arbeitskopie ist; Versuchen Sie stattdessen »%s« umzuplatzieren"
#: ../libsvn_wc/relocate.c:129
-#, fuzzy
msgid "Cannot relocate a single file"
-msgstr "Kann externen Dateiverweis nicht löschen"
+msgstr "Kann eine einzelne Datei nicht umplatzieren"
#: ../libsvn_wc/relocate.c:136
#, c-format
@@ -6868,9 +6856,9 @@ msgid "Error parsing tree conflict skel"
msgstr "Fehler beim Einlesen der Baumkonfliktvorlage"
#: ../libsvn_wc/tree_conflicts.c:468
-#, fuzzy, c-format
+#, c-format
msgid "Attempt to add tree conflict that already exists at '%s'"
-msgstr "Es wurde versucht, einen Baumkonflikt hinzuzufügen, den es bereits gibt"
+msgstr "Es wurde versucht, einen Baumkonflikt hinzuzufügen, der in »%s« bereits vorhanden ist"
#: ../libsvn_wc/update_editor.c:1051
#, c-format
@@ -6896,14 +6884,14 @@ msgstr ""
"Administrationsverzeichnis trägt"
#: ../libsvn_wc/update_editor.c:2313
-#, fuzzy, c-format
+#, c-format
msgid "Failed to add directory '%s': a separate working copy with the same name already exists"
-msgstr "Konnte Verzeichnis »%s« nicht hinzufügen: ein versioniertes Verzeichnis mit demselben Namen existiert bereits"
+msgstr "Konnte Verzeichnis »%s« nicht hinzufügen: ein andere Arbeitskopie mit gleichem Namen existiert bereits"
#: ../libsvn_wc/update_editor.c:2322
-#, fuzzy, c-format
+#, c-format
msgid "Switched directory '%s' does not match expected URL '%s'"
-msgstr "URL »%s« des existierenden Verzeichnisses »%s« entspricht nicht der erwarteten URL »%s«"
+msgstr "Umgestelltes Vereichnis »%s« entspricht nicht der erwarteten URL »%s«"
#: ../libsvn_wc/update_editor.c:2348
#, c-format
@@ -6917,21 +6905,17 @@ msgstr "Konnte Eigenschaften nicht zusam
#: ../libsvn_wc/update_editor.c:2990
#, c-format
msgid "Failed to mark '%s' absent: item of the same name is already scheduled for addition"
-msgstr ""
-"Konnte »%s« nicht als fehlend markieren: ein Objekt mit demselben Namen wurde\n"
-"bereits zur Übertragung eingeplant"
+msgstr "Konnte »%s« nicht als fehlend markieren: ein Eintrag mit demselben Namen wurde bereits zur Hinzufügung eingeplant"
#: ../libsvn_wc/update_editor.c:3081
-#, fuzzy, c-format
+#, c-format
msgid "Failed to add file '%s': object of the same name as the administrative directory"
-msgstr ""
-"Konnte Verzeichnis »%s« nicht hinzufügen, da es denselben Namen wie das\n"
-"Administrationsverzeichnis trägt"
+msgstr "Konnte Datei »%s« nicht hinzufügen, da es denselben Namen wie Administrationsverzeichnis trägt"
#: ../libsvn_wc/update_editor.c:3208
-#, fuzzy, c-format
+#, c-format
msgid "Switched file '%s' does not match expected URL '%s'"
-msgstr "URL »%s« der existierenden Datei »%s« entspricht nicht der erwarteten URL »%s«"
+msgstr "Umgestellte Datei »%s« entspricht nicht der erwarteten URL »%s«"
#: ../libsvn_wc/update_editor.c:3469
#, fuzzy, c-format
Modified: subversion/branches/revprop-packing/subversion/po/ja.po
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/po/ja.po?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/po/ja.po [UTF-8] (original)
+++ subversion/branches/revprop-packing/subversion/po/ja.po [UTF-8] Fri Mar 30 13:55:26 2012
@@ -6235,7 +6235,7 @@ msgstr ""
#. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000"
#: ../libsvn_subr/time.c:85
msgid " (%a, %d %b %Y)"
-msgstr " (%a, %d %b %Y)"
+msgstr " (%x (%a))"
#: ../libsvn_subr/token.c:66
#, fuzzy, c-format
Modified: subversion/branches/revprop-packing/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/svn/cl.h?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/svn/cl.h (original)
+++ subversion/branches/revprop-packing/subversion/svn/cl.h Fri Mar 30 13:55:26 2012
@@ -196,6 +196,7 @@ typedef struct svn_cl__opt_state_t
const char *merge_cmd; /* the external merge command to use */
const char *editor_cmd; /* the external editor command to use */
svn_boolean_t record_only; /* whether to record mergeinfo */
+ svn_boolean_t symmetric_merge; /* symmetric merge */
const char *old_target; /* diff target */
const char *new_target; /* diff target */
svn_boolean_t relocate; /* rewrite urls (svn switch) */
Modified: subversion/branches/revprop-packing/subversion/svn/list-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/svn/list-cmd.c?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/svn/list-cmd.c (original)
+++ subversion/branches/revprop-packing/subversion/svn/list-cmd.c Fri Mar 30 13:55:26 2012
@@ -56,6 +56,13 @@ print_dirent(void *baton,
{
struct print_baton *pb = baton;
const char *entryname;
+ static const char *time_format_long = NULL;
+ static const char *time_format_short = NULL;
+
+ if (time_format_long == NULL)
+ time_format_long = _("%b %d %H:%M");
+ if (time_format_short == NULL)
+ time_format_short = _("%b %d %Y");
if (pb->ctx->cancel_func)
SVN_ERR(pb->ctx->cancel_func(pb->ctx->cancel_baton));
@@ -90,12 +97,12 @@ print_dirent(void *baton,
&& apr_time_sec(dirent->time - now) < (365 * 86400 / 2))
{
apr_err = apr_strftime(timestr, &size, sizeof(timestr),
- _("%b %d %H:%M"), &exp_time);
+ time_format_long, &exp_time);
}
else
{
apr_err = apr_strftime(timestr, &size, sizeof(timestr),
- _("%b %d %Y"), &exp_time);
+ time_format_short, &exp_time);
}
/* if that failed, just zero out the string and print nothing */
Modified: subversion/branches/revprop-packing/subversion/svn/log-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/svn/log-cmd.c?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/svn/log-cmd.c (original)
+++ subversion/branches/revprop-packing/subversion/svn/log-cmd.c Fri Mar 30 13:55:26 2012
@@ -423,18 +423,23 @@ log_entry_receiver_xml(void *baton,
if (log_entry->changed_paths2)
{
- apr_hash_index_t *hi;
+ apr_array_header_t *sorted_paths;
+ int i;
/* <paths> */
svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "paths",
NULL);
- for (hi = apr_hash_first(pool, log_entry->changed_paths2);
- hi != NULL;
- hi = apr_hash_next(hi))
+ /* Get an array of sorted hash keys. */
+ sorted_paths = svn_sort__hash(log_entry->changed_paths2,
+ svn_sort_compare_items_as_paths, pool);
+
+ for (i = 0; i < sorted_paths->nelts; i++)
{
- const char *path = svn__apr_hash_index_key(hi);
- svn_log_changed_path2_t *log_item = svn__apr_hash_index_val(hi);
+ svn_sort__item_t *item = &(APR_ARRAY_IDX(sorted_paths, i,
+ svn_sort__item_t));
+ const char *path = item->key;
+ svn_log_changed_path2_t *log_item = item->value;
char action[2];
action[0] = log_item->action;
Modified: subversion/branches/revprop-packing/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/svn/main.c?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/svn/main.c (original)
+++ subversion/branches/revprop-packing/subversion/svn/main.c Fri Mar 30 13:55:26 2012
@@ -127,6 +127,7 @@ typedef enum svn_cl__longopt_t {
opt_use_patch_diff_format,
opt_allow_mixed_revisions,
opt_include_externals,
+ opt_symmetric,
} svn_cl__longopt_t;
@@ -366,6 +367,8 @@ const apr_getopt_option_t svn_cl__option
"recursion. This does not include externals with a\n"
" "
"fixed revision. (See the svn:externals property)")},
+ {"symmetric", opt_symmetric, 0,
+ N_("Symmetric merge")},
/* Long-opt Aliases
*
@@ -1014,7 +1017,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" repositories.\n"),
{'r', 'c', 'N', opt_depth, 'q', opt_force, opt_dry_run, opt_merge_cmd,
opt_record_only, 'x', opt_ignore_ancestry, opt_accept, opt_reintegrate,
- opt_allow_mixed_revisions} },
+ opt_allow_mixed_revisions, opt_symmetric} },
{ "mergeinfo", svn_cl__mergeinfo, {0}, N_
("Display merge-related information.\n"
@@ -1951,6 +1954,9 @@ main(int argc, const char *argv[])
case opt_record_only:
opt_state.record_only = TRUE;
break;
+ case opt_symmetric:
+ opt_state.symmetric_merge = TRUE;
+ break;
case opt_editor_cmd:
opt_state.editor_cmd = apr_pstrdup(pool, opt_arg);
break;
Modified: subversion/branches/revprop-packing/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/svn/merge-cmd.c?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/svn/merge-cmd.c (original)
+++ subversion/branches/revprop-packing/subversion/svn/merge-cmd.c Fri Mar 30 13:55:26 2012
@@ -33,6 +33,7 @@
#include "svn_error.h"
#include "svn_types.h"
#include "cl.h"
+#include "private/svn_client_private.h"
#include "svn_private_config.h"
@@ -97,6 +98,43 @@ ensure_wc_path_has_repo_revision(const c
return SVN_NO_ERROR;
}
+#ifdef SVN_WITH_SYMMETRIC_MERGE
+/* Symmetric, merge-tracking merge, used for sync or reintegrate purposes. */
+static svn_error_t *
+symmetric_merge(const char *source_path_or_url,
+ const svn_opt_revision_t *source_revision,
+ const char *target_wcpath,
+ svn_depth_t depth,
+ svn_boolean_t ignore_ancestry,
+ svn_boolean_t force,
+ svn_boolean_t record_only,
+ svn_boolean_t dry_run,
+ svn_boolean_t allow_mixed_rev,
+ svn_boolean_t allow_local_mods,
+ svn_boolean_t allow_switched_subtrees,
+ const apr_array_header_t *merge_options,
+ svn_client_ctx_t *ctx,
+ apr_pool_t *scratch_pool)
+{
+ svn_client__symmetric_merge_t *merge;
+
+ /* Find the 3-way merges needed (and check suitability of the WC). */
+ SVN_ERR(svn_client__find_symmetric_merge(&merge,
+ source_path_or_url, source_revision,
+ target_wcpath, allow_mixed_rev,
+ allow_local_mods, allow_switched_subtrees,
+ ctx, scratch_pool, scratch_pool));
+
+ /* Perform the 3-way merges */
+ SVN_ERR(svn_client__do_symmetric_merge(merge, target_wcpath, depth,
+ ignore_ancestry, force, record_only,
+ dry_run, merge_options,
+ ctx, scratch_pool));
+
+ return SVN_NO_ERROR;
+}
+#endif
+
/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
svn_cl__merge(apr_getopt_t *os,
@@ -346,6 +384,34 @@ svn_cl__merge(apr_getopt_t *os,
"with --reintegrate"));
}
+#ifdef SVN_WITH_SYMMETRIC_MERGE
+ if (opt_state->symmetric_merge)
+ {
+ svn_boolean_t allow_local_mods = ! opt_state->reintegrate;
+ svn_boolean_t allow_switched_subtrees = ! opt_state->reintegrate;
+
+ if (two_sources_specified)
+ return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+ _("SOURCE2 can't be used with --symmetric"));
+
+ SVN_ERR_W(svn_cl__check_related_source_and_target(
+ sourcepath1, &peg_revision1, targetpath, &unspecified,
+ ctx, pool),
+ _("Source and target must be different but related branches"));
+
+ err = symmetric_merge(sourcepath1, &peg_revision1, targetpath,
+ opt_state->depth,
+ opt_state->ignore_ancestry,
+ opt_state->force,
+ opt_state->record_only,
+ opt_state->dry_run,
+ opt_state->allow_mixed_rev,
+ allow_local_mods,
+ allow_switched_subtrees,
+ options, ctx, pool);
+ }
+ else
+#endif
if (opt_state->reintegrate)
{
SVN_ERR_W(svn_cl__check_related_source_and_target(
Modified: subversion/branches/revprop-packing/subversion/svnlook/main.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/svnlook/main.c?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/svnlook/main.c (original)
+++ subversion/branches/revprop-packing/subversion/svnlook/main.c Fri Mar 30 13:55:26 2012
@@ -445,7 +445,6 @@ generate_delta_tree(svn_repos_node_t **t
svn_repos_t *repos,
svn_fs_root_t *root,
svn_revnum_t base_rev,
- svn_boolean_t use_copy_history,
apr_pool_t *pool)
{
svn_fs_root_t *base_root;
@@ -462,7 +461,7 @@ generate_delta_tree(svn_repos_node_t **t
base_root, root, pool, edit_pool));
/* Drive our editor. */
- SVN_ERR(svn_repos_replay2(root, "", SVN_INVALID_REVNUM, FALSE,
+ SVN_ERR(svn_repos_replay2(root, "", SVN_INVALID_REVNUM, TRUE,
editor, edit_baton, NULL, NULL, edit_pool));
/* Return the tree we just built. */
@@ -1401,8 +1400,7 @@ do_dirs_changed(svnlook_ctxt_t *c, apr_p
_("Transaction '%s' is not based on a revision; how odd"),
c->txn_name);
- SVN_ERR(generate_delta_tree(&tree, c->repos, root, base_rev_id,
- TRUE, pool));
+ SVN_ERR(generate_delta_tree(&tree, c->repos, root, base_rev_id, pool));
if (tree)
SVN_ERR(print_dirs_changed_tree(tree, "", pool));
@@ -1507,8 +1505,7 @@ do_changed(svnlook_ctxt_t *c, apr_pool_t
_("Transaction '%s' is not based on a revision; how odd"),
c->txn_name);
- SVN_ERR(generate_delta_tree(&tree, c->repos, root, base_rev_id,
- TRUE, pool));
+ SVN_ERR(generate_delta_tree(&tree, c->repos, root, base_rev_id, pool));
if (tree)
SVN_ERR(print_changed_tree(tree, "", c->copy_info, pool));
@@ -1536,8 +1533,7 @@ do_diff(svnlook_ctxt_t *c, apr_pool_t *p
_("Transaction '%s' is not based on a revision; how odd"),
c->txn_name);
- SVN_ERR(generate_delta_tree(&tree, c->repos, root, base_rev_id,
- TRUE, pool));
+ SVN_ERR(generate_delta_tree(&tree, c->repos, root, base_rev_id, pool));
if (tree)
{
const char *tmpdir;
Modified: subversion/branches/revprop-packing/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/svnrdump/dump_editor.c?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/svnrdump/dump_editor.c (original)
+++ subversion/branches/revprop-packing/subversion/svnrdump/dump_editor.c Fri Mar 30 13:55:26 2012
@@ -676,7 +676,7 @@ change_dir_prop(void *parent_baton,
LDR_DBG(("change_dir_prop %p\n", parent_baton));
- if (svn_property_kind(NULL, name) != svn_prop_regular_kind)
+ if (svn_property_kind2(name) != svn_prop_regular_kind)
return SVN_NO_ERROR;
if (value)
@@ -718,7 +718,7 @@ change_file_prop(void *file_baton,
LDR_DBG(("change_file_prop %p\n", file_baton));
- if (svn_property_kind(NULL, name) != svn_prop_regular_kind)
+ if (svn_property_kind2(name) != svn_prop_regular_kind)
return SVN_NO_ERROR;
if (value)
Modified: subversion/branches/revprop-packing/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/svnrdump/load_editor.c?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/svnrdump/load_editor.c (original)
+++ subversion/branches/revprop-packing/subversion/svnrdump/load_editor.c Fri Mar 30 13:55:26 2012
@@ -876,7 +876,7 @@ remove_node_props(void *baton)
for (hi = apr_hash_first(pool, props); hi; hi = apr_hash_next(hi))
{
const char *name = svn__apr_hash_index_key(hi);
- svn_prop_kind_t kind = svn_property_kind(NULL, name);
+ svn_prop_kind_t kind = svn_property_kind2(name);
if (kind == svn_prop_regular_kind)
SVN_ERR(set_node_property(nb, name, NULL));
Modified: subversion/branches/revprop-packing/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/svnserve/serve.c?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/svnserve/serve.c (original)
+++ subversion/branches/revprop-packing/subversion/svnserve/serve.c Fri Mar 30 13:55:26 2012
@@ -1470,7 +1470,7 @@ static svn_error_t *get_dir(svn_ra_svn_c
apr_array_header_t *params, void *baton)
{
server_baton_t *b = baton;
- const char *path, *full_path, *file_path, *cauthor, *cdate;
+ const char *path, *full_path, *file_path, *cdate;
svn_revnum_t rev;
apr_hash_t *entries, *props = NULL, *file_props;
apr_hash_index_t *hi;
@@ -1540,9 +1540,15 @@ static svn_error_t *get_dir(svn_ra_svn_c
if (want_props)
SVN_CMD_ERR(get_props(&props, root, full_path, pool));
- /* Fetch the directory entries if requested. */
+ /* Begin response ... */
+ SVN_ERR(svn_ra_svn_write_tuple(conn, pool, "w(r(!", "success", rev));
+ SVN_ERR(svn_ra_svn_write_proplist(conn, pool, props));
+ SVN_ERR(svn_ra_svn_write_tuple(conn, pool, "!)(!"));
+
+ /* Fetch the directory entries if requested and send them immediately. */
if (want_contents)
{
+ const char *zero_date = svn_time_to_cstring(0, pool);
SVN_CMD_ERR(svn_fs_dir_entries(&entries, root, full_path, pool));
/* Transform the hash table's FS entries into dirents. This probably
@@ -1552,91 +1558,62 @@ static svn_error_t *get_dir(svn_ra_svn_c
{
const char *name = svn__apr_hash_index_key(hi);
svn_fs_dirent_t *fsent = svn__apr_hash_index_val(hi);
- svn_dirent_t *entry;
+
+ svn_dirent_t entry;
+ memset(&entry, 0, sizeof(entry));
svn_pool_clear(subpool);
file_path = svn_fspath__join(full_path, name, subpool);
-
if (! lookup_access(subpool, b, conn, svn_authz_read,
file_path, FALSE))
- {
- apr_hash_set(entries, name, APR_HASH_KEY_STRING, NULL);
- continue;
- }
-
- entry = apr_pcalloc(pool, sizeof(*entry));
+ continue;
if (dirent_fields & SVN_DIRENT_KIND)
- {
- /* kind */
- entry->kind = fsent->kind;
- }
+ entry.kind = fsent->kind;
if (dirent_fields & SVN_DIRENT_SIZE)
- {
- /* size */
- if (entry->kind == svn_node_dir)
- entry->size = 0;
- else
- SVN_CMD_ERR(svn_fs_file_length(&entry->size, root, file_path,
+ if (entry.kind != svn_node_dir)
+ SVN_CMD_ERR(svn_fs_file_length(&entry.size, root, file_path,
subpool));
- }
if (dirent_fields & SVN_DIRENT_HAS_PROPS)
{
/* has_props */
SVN_CMD_ERR(svn_fs_node_proplist(&file_props, root, file_path,
subpool));
- entry->has_props = (apr_hash_count(file_props) > 0);
+ entry.has_props = (apr_hash_count(file_props) > 0);
}
+ cdate = NULL;
if ((dirent_fields & SVN_DIRENT_LAST_AUTHOR)
|| (dirent_fields & SVN_DIRENT_TIME)
|| (dirent_fields & SVN_DIRENT_CREATED_REV))
{
/* created_rev, last_author, time */
- SVN_CMD_ERR(svn_repos_get_committed_info(&entry->created_rev,
+ SVN_CMD_ERR(svn_repos_get_committed_info(&entry.created_rev,
&cdate,
- &cauthor, root,
+ &entry.last_author,
+ root,
file_path,
subpool));
- entry->last_author = apr_pstrdup(pool, cauthor);
- if (cdate)
- SVN_CMD_ERR(svn_time_from_cstring(&entry->time, cdate,
- subpool));
- else
- entry->time = (time_t) -1;
}
- /* Store the entry. */
- apr_hash_set(entries, name, APR_HASH_KEY_STRING, entry);
- }
- svn_pool_destroy(subpool);
- }
-
- /* Write out response. */
- SVN_ERR(svn_ra_svn_write_tuple(conn, pool, "w(r(!", "success", rev));
- SVN_ERR(svn_ra_svn_write_proplist(conn, pool, props));
- SVN_ERR(svn_ra_svn_write_tuple(conn, pool, "!)(!"));
- if (want_contents)
- {
- for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi))
- {
- const char *name = svn__apr_hash_index_key(hi);
- svn_dirent_t *entry = svn__apr_hash_index_val(hi);
+ if (cdate == NULL)
+ cdate = zero_date;
- cdate = (entry->time == (time_t) -1) ? NULL
- : svn_time_to_cstring(entry->time, pool);
+ /* Send the entry. */
SVN_ERR(svn_ra_svn_write_tuple(conn, pool, "cwnbr(?c)(?c)", name,
- svn_node_kind_to_word(entry->kind),
- (apr_uint64_t) entry->size,
- entry->has_props, entry->created_rev,
- cdate, entry->last_author));
+ svn_node_kind_to_word(entry.kind),
+ (apr_uint64_t) entry.size,
+ entry.has_props, entry.created_rev,
+ cdate, entry.last_author));
}
+ svn_pool_destroy(subpool);
}
- SVN_ERR(svn_ra_svn_write_tuple(conn, pool, "!))"));
- return SVN_NO_ERROR;
+
+ /* Finish response. */
+ return svn_ra_svn_write_tuple(conn, pool, "!))");
}
static svn_error_t *update(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
Modified: subversion/branches/revprop-packing/subversion/svnsync/sync.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/svnsync/sync.c?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/svnsync/sync.c (original)
+++ subversion/branches/revprop-packing/subversion/svnsync/sync.c Fri Mar 30 13:55:26 2012
@@ -386,7 +386,7 @@ change_file_prop(void *file_baton,
edit_baton_t *eb = fb->edit_baton;
/* only regular properties can pass over libsvn_ra */
- if (svn_property_kind(NULL, name) != svn_prop_regular_kind)
+ if (svn_property_kind2(name) != svn_prop_regular_kind)
return SVN_NO_ERROR;
/* Maybe drop svn:mergeinfo. */
@@ -434,7 +434,7 @@ change_dir_prop(void *dir_baton,
edit_baton_t *eb = db->edit_baton;
/* Only regular properties can pass over libsvn_ra */
- if (svn_property_kind(NULL, name) != svn_prop_regular_kind)
+ if (svn_property_kind2(name) != svn_prop_regular_kind)
return SVN_NO_ERROR;
/* Maybe drop svn:mergeinfo. */
Modified: subversion/branches/revprop-packing/subversion/tests/cmdline/authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/tests/cmdline/authz_tests.py?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/branches/revprop-packing/subversion/tests/cmdline/authz_tests.py Fri Mar 30 13:55:26 2012
@@ -1290,7 +1290,8 @@ def wc_commit_error_handling(sbox):
# Allow the informative error for dav and the ra_svn specific one that is
# returned on editor->edit_close().
expected_err = "(svn: E195023: Changing directory '.*Z' is forbidden)|" + \
- "(svn: E220004: Access denied)"
+ "(svn: E220004: Access denied)|" + \
+ "(svn: E175013: Access to '.*Z' forbidden)"
svntest.actions.run_and_verify_svn(None, None, expected_err,
'ci', wc_dir, '-m', '')
@@ -1302,7 +1303,8 @@ def wc_commit_error_handling(sbox):
# Allow the informative error for dav and the ra_svn specific one that is
# returned on editor->edit_close().
expected_err = "(svn: E195023: Changing file '.*zeta' is forbidden)|" + \
- "(svn: E220004: Access denied)"
+ "(svn: E220004: Access denied)|" + \
+ "(svn: E175013: Access to '.*zeta' forbidden)"
svntest.actions.run_and_verify_svn(None, None, expected_err,
'ci', wc_dir, '-m', '')
sbox.simple_revert('A/zeta')
@@ -1323,7 +1325,8 @@ def wc_commit_error_handling(sbox):
# Allow the informative error for dav and the ra_svn specific one that is
# returned on editor->edit_close().
expected_err = "(svn: E195023: Changing file '.*lambda' is forbidden.*)|" + \
- "(svn: E220004: Access denied)"
+ "(svn: E220004: Access denied)|" + \
+ "(svn: E175013: Access to '.*lambda' forbidden)"
svntest.actions.run_and_verify_svn(None, None, expected_err,
'ci', wc_dir, '-m', '')
@@ -1333,7 +1336,8 @@ def wc_commit_error_handling(sbox):
# Allow the informative error for dav and the ra_svn specific one that is
# returned on editor->edit_close().
expected_err = "(svn: E195023: Changing file '.*lambda' is forbidden.*)|" + \
- "(svn: E220004: Access denied)"
+ "(svn: E220004: Access denied)|" + \
+ "(svn: E175013: Access to '.*lambda' forbidden)"
svntest.actions.run_and_verify_svn(None, None, expected_err,
'ci', wc_dir, '-m', '')
@@ -1343,7 +1347,8 @@ def wc_commit_error_handling(sbox):
# Allow the informative error for dav and the ra_svn specific one that is
# returned on editor->edit_close().
expected_err = "(svn: E195023: Changing directory '.*F' is forbidden.*)|" + \
- "(svn: E220004: Access denied)"
+ "(svn: E220004: Access denied)|" + \
+ "(svn: E175013: Access to '.*F' forbidden)"
svntest.actions.run_and_verify_svn(None, None, expected_err,
'ci', wc_dir, '-m', '')
sbox.simple_revert('A/B/F')
@@ -1352,7 +1357,8 @@ def wc_commit_error_handling(sbox):
# Allow the informative error for dav and the ra_svn specific one that is
# returned on editor->edit_close().
expected_err = "(svn: E195023: Changing file '.*mu' is forbidden.*)|" + \
- "(svn: E220004: Access denied)"
+ "(svn: E220004: Access denied)|" + \
+ "(svn: E175013: Access to '.*mu' forbidden)"
svntest.actions.run_and_verify_svn(None, None, expected_err,
'ci', wc_dir, '-m', '')
Modified: subversion/branches/revprop-packing/subversion/tests/cmdline/checkout_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/tests/cmdline/checkout_tests.py?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/tests/cmdline/checkout_tests.py (original)
+++ subversion/branches/revprop-packing/subversion/tests/cmdline/checkout_tests.py Fri Mar 30 13:55:26 2012
@@ -31,6 +31,7 @@ import sys, re, os, time, subprocess
# Our testing module
import svntest
from svntest import wc, actions
+import logging
# (abbreviation)
Skip = svntest.testcase.Skip_deco
@@ -41,6 +42,8 @@ Issue = svntest.testcase.Issue_deco
Wimp = svntest.testcase.Wimp_deco
Item = wc.StateItem
+logger = logging.getLogger()
+
#----------------------------------------------------------------------
# Helper function for testing stderr from co.
# If none of the strings in STDERR list matches the regular expression
@@ -50,10 +53,9 @@ def test_stderr(re_string, stderr):
for line in stderr:
if exp_err_re.search(line):
return
- if svntest.main.options.verbose:
- for x in stderr:
- sys.stdout.write(x)
- print("Expected stderr reg-ex: '" + re_string + "'")
+ for x in stderr:
+ logger.debug(x[:-1])
+ logger.info("Expected stderr reg-ex: '" + re_string + "'")
raise svntest.Failure("Checkout failed but not in the expected way")
#----------------------------------------------------------------------
Modified: subversion/branches/revprop-packing/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/tests/cmdline/copy_tests.py?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/branches/revprop-packing/subversion/tests/cmdline/copy_tests.py Fri Mar 30 13:55:26 2012
@@ -5675,6 +5675,23 @@ def three_nested_moves(sbox):
expected_status,
None, wc_dir)
+def copy_to_unversioned_parent(sbox):
+ "copy to unversioned parent"
+
+ sbox.build()
+
+ # This succeeds
+ #svntest.actions.run_and_verify_svn(None, None, [], 'cp', '--parents',
+ # sbox.ospath('A/B'),
+ # sbox.ospath('New/B2'))
+
+ # And this currently fails with The node '.*Unversioned' was not found,
+ # while it should succeed or returns some error that a GUI client can use.
+ os.mkdir(sbox.ospath('Unversioned'))
+ svntest.actions.run_and_verify_svn(None, None, [], 'cp', '--parents',
+ sbox.ospath('A/B'),
+ sbox.ospath('Unversioned/B2'))
+
########################################################################
# Run the tests
@@ -5789,6 +5806,7 @@ test_list = [ None,
commit_deleted_half_of_move,
wc_wc_copy_incomplete,
three_nested_moves,
+ copy_to_unversioned_parent,
]
if __name__ == '__main__':
Modified: subversion/branches/revprop-packing/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/tests/cmdline/depth_tests.py?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/branches/revprop-packing/subversion/tests/cmdline/depth_tests.py Fri Mar 30 13:55:26 2012
@@ -2843,7 +2843,6 @@ def update_below_depth_empty(sbox):
None, None)
# Test for issue #4136.
-@XFail()
@Issue(4136)
def commit_then_immediates_update(sbox):
"deep commit followed by update --depth immediates"
Modified: subversion/branches/revprop-packing/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/branches/revprop-packing/subversion/tests/cmdline/merge_reintegrate_tests.py Fri Mar 30 13:55:26 2012
@@ -2580,7 +2580,26 @@ def reintegrate_symlink_deletion(sbox):
svntest.main.run_svn(None, 'merge', '--reintegrate',
A_COPY_url, A_path)
+#----------------------------------------------------------------------
+def no_op_reintegrate(sbox):
+ """no-op reintegrate"""
+
+ # Make A_COPY branch in r2, and do a few more commits to A in r3-6.
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ A_path = sbox.ospath('A')
+ A_COPY_path = sbox.ospath('A_COPY')
+ expected_disk, expected_status = set_up_branch(sbox)
+
+ # Sync merge from trunk to branch
+ svntest.main.run_svn(None, 'merge', sbox.repo_url + '/A', A_COPY_path)
+ sbox.simple_commit()
+ sbox.simple_update()
+ # Reintegrate; there are no relevant changes on the branch.
+ # ### TODO: Check the result more carefully than merely that it completed.
+ svntest.main.run_svn(None, 'merge', '--reintegrate',
+ sbox.repo_url + '/A_COPY', A_path)
########################################################################
# Run the tests
@@ -2606,6 +2625,7 @@ test_list = [ None,
no_source_subtree_mergeinfo,
reintegrate_replaced_source,
reintegrate_symlink_deletion,
+ no_op_reintegrate,
]
if __name__ == '__main__':
Modified: subversion/branches/revprop-packing/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/tests/cmdline/merge_tests.py?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/branches/revprop-packing/subversion/tests/cmdline/merge_tests.py Fri Mar 30 13:55:26 2012
@@ -17405,6 +17405,151 @@ def svnmucc_abuse_1(sbox):
svntest.main.run_svn(None, 'merge', '-c', 'r5', '^/A@r5',
sbox.ospath('A_COPY'))
+#----------------------------------------------------------------------
+# Test for issue #4138 'replacement in merge source not notified correctly'.
+@SkipUnless(server_has_mergeinfo)
+@XFail()
+@Issue(4138)
+def merge_source_with_replacement(sbox):
+ "replacement in merge source not notified correctly"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ # Some paths we'll care about.
+ A_path = os.path.join(sbox.wc_dir, 'A')
+ omega_path = os.path.join(sbox.wc_dir, 'A', 'D', 'H', 'omega')
+ A_COPY_path = os.path.join(sbox.wc_dir, 'A_COPY')
+ beta_COPY_path = os.path.join(sbox.wc_dir, 'A_COPY', 'B', 'E', 'beta')
+ psi_COPY_path = os.path.join(sbox.wc_dir, 'A_COPY', 'D', 'H', 'psi')
+ rho_COPY_path = os.path.join(sbox.wc_dir, 'A_COPY', 'D', 'G', 'rho')
+ omega_COPY_path = os.path.join(sbox.wc_dir, 'A_COPY', 'D', 'H', 'omega')
+
+ # branch A@1 to A_COPY in r2, then make a few edits under A in r3-6:
+ wc_disk, wc_status = set_up_branch(sbox)
+
+ # r7 Delete A, replace it with A@5, effectively reverting the change
+ # made to A/D/H/omega in r6:
+ svntest.main.run_svn(None, 'up', wc_dir)
+ svntest.main.run_svn(None, 'del', A_path)
+ svntest.main.run_svn(None, 'copy', sbox.repo_url + '/A@5', A_path)
+ svntest.main.run_svn(None, 'ci', '-m',
+ 'Replace A with older version of itself', wc_dir)
+
+ # r8: Make an edit to A/D/H/omega:
+ svntest.main.file_write(omega_path, "New content for 'omega'.\n")
+ svntest.main.run_svn(None, 'ci', '-m', 'file edit', wc_dir)
+
+ # Update and sync merge ^/A to A_COPY.
+ svntest.main.run_svn(None, 'up', wc_dir)
+ # This currently fails because the merge notifications make it look like
+ # r6 from ^/A was merged and recorded:
+ #
+ # >svn merge ^^/A A_COPY
+ # --- Merging r2 through r5 into 'A_COPY':
+ # U A_COPY\B\E\beta
+ # U A_COPY\D\G\rho
+ # U A_COPY\D\H\psi
+ # --- Recording mergeinfo for merge of r2 through r5 into 'A_COPY':
+ # U A_COPY
+ # --- Merging r6 through r8 into 'A_COPY':
+ # U A_COPY\D\H\omega
+ # --- Recording mergeinfo for merge of r6 through r8 into 'A_COPY':
+ # G A_COPY
+ expected_output = expected_merge_output([[2,5],[7,8]],
+ ['U ' + beta_COPY_path + '\n',
+ 'U ' + rho_COPY_path + '\n',
+ 'U ' + omega_COPY_path + '\n',
+ 'U ' + psi_COPY_path + '\n',
+ ' U ' + A_COPY_path + '\n',
+ ' G ' + A_COPY_path + '\n',])
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'merge', sbox.repo_url + '/A',
+ A_COPY_path)
+
+#----------------------------------------------------------------------
+# Test for issue #4144 'Reverse merge with replace in source applies
+# diffs in forward order'.
+@SkipUnless(server_has_mergeinfo)
+@XFail()
+@Issue(4144)
+def reverse_merge_with_rename(sbox):
+ "reverse merge applies revs in reverse order"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ # Some paths we'll care about.
+ A_path = os.path.join(sbox.wc_dir, 'A')
+ omega_path = os.path.join(sbox.wc_dir, 'trunk', 'D', 'H', 'omega')
+ A_COPY_path = os.path.join(sbox.wc_dir, 'A_COPY')
+ beta_COPY_path = os.path.join(sbox.wc_dir, 'A_COPY', 'B', 'E', 'beta')
+ psi_COPY_path = os.path.join(sbox.wc_dir, 'A_COPY', 'D', 'H', 'psi')
+ rho_COPY_path = os.path.join(sbox.wc_dir, 'A_COPY', 'D', 'G', 'rho')
+ omega_COPY_path = os.path.join(sbox.wc_dir, 'A_COPY', 'D', 'H', 'omega')
+
+ # branch A@1 to A_COPY in r2, then make a few edits under A in r3-6:
+ wc_disk, wc_status = set_up_branch(sbox)
+
+ # r7 - Rename ^/A to ^/trunk.
+ svntest.actions.run_and_verify_svn(None,
+ ['\n', 'Committed revision 7.\n'],
+ [], 'move',
+ sbox.repo_url + '/A',
+ sbox.repo_url + '/trunk',
+ '-m', "Rename 'A' to 'trunk'")
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+
+ # r8 - Make and edit to trunk/D/H/omega (which was also edited in r6).
+ svntest.main.file_write(omega_path, "Edit 'omega' on trunk.\n")
+ svntest.main.run_svn(None, 'ci', '-m', 'Another omega edit', wc_dir)
+
+ # r9 - Sync merge ^/trunk to A_COPY.
+ svntest.actions.run_and_verify_svn(None,
+ None, # Don't check stdout, we test this
+ # type of merge to death elsewhere.
+ [], 'merge', sbox.repo_url + '/trunk',
+ A_COPY_path)
+ svntest.main.run_svn(None, 'ci', '-m', 'Sync A_COPY with ^/trunk', wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+
+ # Reverse merge -r9:1 from ^/trunk to A_COPY. This should return
+ # A_COPY to the same state it had prior to the sync merge in r2.
+ #
+ # This currently fails because the Subversion tries to reverse merge
+ # -r6:1 first, then -r8:6, causing a spurious conflict on omega:
+ #
+ # >svn merge ^/trunk A_COPY -r9:1 --accept=postpone
+ # --- Reverse-merging r6 through r2 into 'A_COPY':
+ # U A_COPY\B\E\beta
+ # U A_COPY\D\G\rho
+ # C A_COPY\D\H\omega
+ # U A_COPY\D\H\psi
+ # --- Recording mergeinfo for reverse merge of r6 through r2 into 'A_COPY':
+ # U A_COPY
+ # Summary of conflicts:
+ # Text conflicts: 1
+ # ..\..\..\subversion\svn\util.c:913: (apr_err=155015)
+ # ..\..\..\subversion\libsvn_client\merge.c:10848: (apr_err=155015)
+ # ..\..\..\subversion\libsvn_client\merge.c:10812: (apr_err=155015)
+ # ..\..\..\subversion\libsvn_client\merge.c:8984: (apr_err=155015)
+ # ..\..\..\subversion\libsvn_client\merge.c:4728: (apr_err=155015)
+ # svn: E155015: One or more conflicts were produced while merging r6:1
+ # into 'C:\SVN\src-trunk-4\Debug\subversion\tests\cmdline\svn-test-work
+ # \working_copies\merge_tests-127\A_COPY' -- resolve all conflicts and
+ # rerun the merge to apply the remaining unmerged revisions
+ expected_output = expected_merge_output(
+ [[8,7],[6,2]],
+ ['U ' + beta_COPY_path + '\n',
+ 'U ' + rho_COPY_path + '\n',
+ 'U ' + omega_COPY_path + '\n',
+ 'G ' + omega_COPY_path + '\n',
+ 'U ' + psi_COPY_path + '\n',
+ ' U ' + A_COPY_path + '\n',
+ ' G ' + A_COPY_path + '\n',], elides=True)
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
+ 'merge', sbox.repo_url + '/trunk',
+ A_COPY_path, '-r9:1')
########################################################################
# Run the tests
@@ -17537,6 +17682,8 @@ test_list = [ None,
unnecessary_noninheritable_mergeinfo_missing_subtrees,
unnecessary_noninheritable_mergeinfo_shallow_merge,
svnmucc_abuse_1,
+ merge_source_with_replacement,
+ reverse_merge_with_rename,
]
if __name__ == '__main__':
Modified: subversion/branches/revprop-packing/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/tests/cmdline/svnadmin_tests.py?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/branches/revprop-packing/subversion/tests/cmdline/svnadmin_tests.py Fri Mar 30 13:55:26 2012
@@ -29,6 +29,7 @@ import os
import re
import shutil
import sys
+import threading
# Our testing module
import svntest
@@ -1780,6 +1781,47 @@ def locking(sbox):
iota_token)
+@SkipUnless(svntest.main.is_threaded_python)
+@Issue(4129)
+def mergeinfo_race(sbox):
+ "concurrent mergeinfo commits invalidate pred-count"
+ sbox.build()
+
+ wc_dir = sbox.wc_dir
+ wc2_dir = sbox.add_wc_path('2')
+
+ ## Create wc2.
+ svntest.main.run_svn(None, 'checkout', '-q', sbox.repo_url, wc2_dir)
+
+ ## Some random edits.
+ svntest.main.run_svn(None, 'mkdir', sbox.ospath('d1', wc_dir))
+ svntest.main.run_svn(None, 'mkdir', sbox.ospath('d2', wc2_dir))
+
+ ## Set random mergeinfo properties.
+ svntest.main.run_svn(None, 'ps', 'svn:mergeinfo', '/P:42', sbox.ospath('A', wc_dir))
+ svntest.main.run_svn(None, 'ps', 'svn:mergeinfo', '/Q:42', sbox.ospath('iota', wc2_dir))
+
+ def makethread(some_wc_dir):
+ def worker():
+ svntest.main.run_svn(None, 'commit', '-mm', some_wc_dir)
+ return worker
+
+ t1 = threading.Thread(None, makethread(wc_dir))
+ t2 = threading.Thread(None, makethread(wc2_dir))
+
+ # t2 will trigger the issue #4129 sanity check in fs_fs.c
+ t1.start(); t2.start();
+
+ t1.join(); t2.join();
+
+ # Crude attempt to make sure everything worked.
+ # TODO: better way to catch exceptions in the thread
+ if svntest.actions.run_and_parse_info(sbox.repo_url)[0]['Revision'] != '3':
+ raise svntest.Failure("one or both commits failed")
+
+
+
+
########################################################################
# Run the tests
@@ -1814,6 +1856,7 @@ test_list = [ None,
hotcopy_incremental,
hotcopy_incremental_packed,
locking,
+ mergeinfo_race,
]
if __name__ == '__main__':
Modified: subversion/branches/revprop-packing/subversion/tests/cmdline/svnlook_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/tests/cmdline/svnlook_tests.py?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/tests/cmdline/svnlook_tests.py (original)
+++ subversion/branches/revprop-packing/subversion/tests/cmdline/svnlook_tests.py Fri Mar 30 13:55:26 2012
@@ -701,6 +701,23 @@ fp.close()"""
' bogus_rev_prop\n', ' svn:date\n']
verify_logfile(logfilepath, svntest.verify.UnorderedOutput(expected_data))
+def property_delete(sbox):
+ "property delete"
+
+ sbox.build()
+ repo_dir = sbox.repo_dir
+
+ sbox.simple_propset('foo', 'bar', 'A/mu')
+ sbox.simple_commit()
+ sbox.simple_propdel('foo', 'A/mu')
+ sbox.simple_commit()
+
+ # XFail since r1293375, changed and diff produce no output on a
+ # property delete
+ svntest.actions.run_and_verify_svnlook(None, ["_U A/mu\n"], [],
+ 'changed', repo_dir)
+
+
########################################################################
# Run the tests
@@ -719,6 +736,7 @@ test_list = [ None,
diff_binary,
test_filesize,
test_txn_flag,
+ property_delete,
]
if __name__ == '__main__':
Modified: subversion/branches/revprop-packing/subversion/tests/cmdline/svnsync_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-packing/subversion/tests/cmdline/svnsync_tests.py?rev=1307424&r1=1307423&r2=1307424&view=diff
==============================================================================
--- subversion/branches/revprop-packing/subversion/tests/cmdline/svnsync_tests.py (original)
+++ subversion/branches/revprop-packing/subversion/tests/cmdline/svnsync_tests.py Fri Mar 30 13:55:26 2012
@@ -28,7 +28,7 @@
import sys, os
# Test suite-specific modules
-import locale, re
+import locale, re, urllib
# Our testing module
import svntest
@@ -191,14 +191,16 @@ def setup_and_sync(sbox, dump_file_conte
repo_url = sbox.repo_url
cwd = os.getcwd()
if is_src_ra_local:
- repo_url = svntest.main.file_scheme_prefix + svntest.main.pathname2url(os.path.join(cwd, sbox.repo_dir))
+ repo_url = svntest.main.file_scheme_prefix + \
+ urllib.pathname2url(os.path.join(cwd, sbox.repo_dir))
if subdir:
repo_url = repo_url + subdir
dest_repo_url = dest_sbox.repo_url
if is_dest_ra_local:
- dest_repo_url = svntest.main.file_scheme_prefix + svntest.main.pathname2url(os.path.join(cwd, dest_sbox.repo_dir))
+ dest_repo_url = svntest.main.file_scheme_prefix + \
+ urllib.pathname2url(os.path.join(cwd, dest_sbox.repo_dir))
run_init(dest_repo_url, repo_url, source_prop_encoding)
run_sync(dest_repo_url, repo_url,
@@ -1029,7 +1031,7 @@ def copy_delete_unreadable_child(sbox):
% (authz, authz))
dest_url = svntest.main.file_scheme_prefix \
- + svntest.main.pathname2url(os.path.abspath(dest_sbox.repo_dir))
+ + urllib.pathname2url(os.path.abspath(dest_sbox.repo_dir))
run_init(dest_url, sbox.repo_url)
run_sync(dest_url)