Checkout Tools
  • last updated 5 hours ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 849442 is being indexed.

* doc/user/svn-best-practices.html: fix broken </em> tag.

* doc/user/svn-best-practices.html: fix broken </a> tag.

* doc/user/svn-best-practices.html: set svn:mime-type to text/html.
* doc/user/svn-best-practices.html: beginnings of a new document.

* svn-ref.tex: if it's in our doc tree, might as well keep it accurate.
Follow-up to r6597:

* doc/book/book/ch03.xml, doc/book/book/ch06.xml, doc/book/book/ch08.xml

* doc/book/book/appa.xml, doc/book/outline.txt

* doc/translations/french/client.texi, doc/user/svn-ref.tex

* tools/client-side/psvn/psvn.el, tools/client-side/vc-svn.el

The command is "resolved" now, not "resolve".

* subversion/include/svn_wc.h

* subversion/libsvn_wc/adm_crawler.c

* subversion/libsvn_wc/adm_ops.c

* subversion/libsvn_client/resolved.c

(svn_wc_resolved_conflict) Replaces svn_wc_resolve_conflict.

  1. … 12 more files in changeset.
Revert revision 6173, as per list discussion: back to 'svn revert'

again, instead of 'svn undo', and we'll find some other way to resolve

issue #1341.

  1. … 45 more files in changeset.
Fix issue #1341: Change 'svn revert' to 'svn undo', to avoid confusion

with 'svn resolve'.

* subversion/libsvn_wc/adm_ops.c

(error_in_undo): Replaces revert_error.

(undo_admin_things): Replaces revert_admin_things.

(svn_wc_add): Fix comments.

(svn_wc_undo): Replaces svn_wc_revert. Adjust for above changes.

* subversion/include/svn_wc.h

(svn_wc_undo): Replaces svn_wc_revert.

(svn_wc_notify_action_t): Use svn_wc_notify_undo instead of

svn_wc_notify_revert now. All callers changed.

* subversion/clients/cmdline/feedback.c

(notify): Adjust for new notifications.

* subversion/libsvn_client/revert.c: Renamed to below.

* subversion/libsvn_client/undo.c: New file, replaces revert.c.

(svn_client_undo): Replaces svn_client_revert. Call svn_wc_undo

now, not svn_wc_revert.

* subversion/include/svn_client.h

(svn_client_undo): Replaces svn_client_revert.

* subversion/clients/cmdline/main.c

(svn_cl__cmd_table): Use "undo" instead of "revert".

* subversion/clients/cmdline/revert-cmd.c: Renamed to below.

* subversion/clients/cmdline/undo-cmd.c: New file, replaces


(svn_cl__undo): Replaces svn_cl__revert.

* subversion/clients/cmdline/cl.h: Declare svn_cl__undo.


* subversion/tests/clients/cmdline/

(basic_undo): Replaces basic_revert.

(test_list): Adjust for above.

* subversion/tests/clients/cmdline/

(mv_and_undo_directory): Replaces mv_and_revert_directory.

(repos_to_wc): Call undo instead of revert.

(test_list): Adjust for above.

* subversion/tests/clients/cmdline/

(textual_merges_galore, simple_property_merges, merge_one_file):

Call undo instead of revert.

* subversion/tests/clients/cmdline/

(undo_replacement_props): Replaces revert_replacement_props.

(test_list): Adjust for above.

* subversion/tests/clients/cmdline/

(undo_add_files, undo_add_directories, undo_nested_adds,

undo_add_executable, undo_delete_files, undo_delete_dirs):

Replace revert_add_files, revert_add_directories,

revert_nested_adds, revert_add_executable, revert_delete_files,

and revert_delete_dirs respectively.

(test_list): Adjust for above.

* subversion/tests/clients/cmdline/

(commit_routine_switching): Use undo instead of revert.

* subversion/tests/clients/cmdline/ Adjust comment.

* subversion/tests/clients/cmdline/

(update_to_resolve_text_conflicts): Replaces

update_to_revert_text_conflicts. No comment.

(test_list): Adjust.

* subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout,



Documentation and notes:

* doc/book/book/appa.xml, doc/book/book/ch03.xml,

doc/book/book/ch04.xml, doc/book/book/ch08.xml,

doc/book/book/ch06.xml: Adjust accordingly.

* doc/translations/french/appendices.texi: Adjust.

* doc/book/outline.txt: Adjust.

* doc/user/svn-ref.tex: Adjust.

* subversion/clients/cmdline/man/svn.1: Adjust.

* notes/autoversioning-strategy.txt: Adjust

* www/project_faq.html

(undo): Replaces "revert" question.

* CHANGES: Mention that it's 'svn undo' now.


* tools/client-side/bash_completion: Adjust completions.

* tools/client-side/psvn/psvn.el

(svn-status-undo-file): Replaces svn-status-revert-file.

Keybinding also changed, but see comment about narrowing keyspace.

* tools/client-side/vc-svn.el

(vc-svn-undo): Replaces vc-svn-revert.

* tools/dev/svn-dev.el

(svn-undo): Replaces svn-revert.


* subversion/bindings/ruby/wc.c

(wc_undo): Replaces wc_revert. Call svn_wc_undo now.

(svn_ruby_init_wc): Change wc_revert to wc_undo, although the whole

thing is commented out so this is just cosmetic.

* subversion/bindings/ruby/client.c

(cl_undo): Replaces cl_revert. Call svn_client_undo now.

(svn_ruby_init_client): Map "undo" to cl_undo, instead of "revert"

to cl_revert.

* subversion/bindings/java/javahl/native/SVNClient.h

(class SVNClient): It's undo, not revert.

* subversion/bindings/java/javahl/native/Notify.cpp

(Notify::onNotify): Use undo instead of revert.

* subversion/bindings/java/javahl/native/SVNClient.cpp

(SVNClient::undo): Replaces SVNClient::revert. Call svn_client_undo.

* subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp

(Java_org_tigris_subversion_javahl_SVNClient_undo): Replace

Java_org_tigris_subversion_javahl_SVNClient_revert, etc.

* subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/

(Notify.Action): Use undo instead of revert.

* subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/

(SVNClient.undo): Replaces revert.

  1. … 45 more files in changeset.

* doc/book/book/ch01.xml,

* doc/user/lj_article.txt:


  1. … 2 more files in changeset.
* www/project_faq.html, doc/user/lj_article.txt: Change some more

occurrences of "revision control" to "version control".

Patch by: zbrown

* www/variance-adjusted-patching.html: Same. Also, add an original

datestamp, something I'd been meaning to get around to. This is the

creation date reflected in our CVS repository and our ChangeLog, and

makes it clear for "prior art" purposes that the idea has been out

there for a while (probably since before this document, since I'm

sure I didn't think of it first).

  1. … 2 more files in changeset.
Go hog wild on all that stutt-stuttering going on.

* PORTING: Remove stuttering.

* doc/handbook/appendices.texi: Remove stuttering.

* doc/handbook/client.texi: Remove stuttering.

* doc/handbook/repos_admin.texi: Remove stuttering.

* doc/user/lj_article.txt: Remove stuttering.

* notes/fs-improvements.txt: Remove stuttering.

* subversion/clients/cmdline/log-cmd.c: Remove stuttering.

* subversion/include/svn_client.h: Remove stuttering.

* subversion/include/svn_fs.h: Remove stuttering.

* subversion/include/svn_ra.h: Remove stuttering.

* subversion/include/svn_wc.h: Remove stuttering.

* subversion/libsvn_fs/fs.c: Remove stuttering.

* subversion/libsvn_fs/tree.c: Remove stuttering.

* subversion/libsvn_ra_dav/commit.c: Remove stuttering.

* subversion/libsvn_ra_dav/merge.c: Remove stuttering.

* subversion/libsvn_ra_local/commit_editor.c: Remove stuttering.

* subversion/libsvn_repos/dump.c: Remove stuttering.

* subversion/libsvn_repos/hooks.txt: Remove stuttering.

* subversion/libsvn_repos/repos.c: Remove stuttering.

* subversion/libsvn_subr/ Remove stuttering.

* subversion/libsvn_subr/target.c: Remove stuttering.

* subversion/libsvn_subr/xml.c: Remove stuttering.

* subversion/libsvn_wc/adm_ops.c: Remove stuttering.

* subversion/libsvn_wc/diff.c: Remove stuttering.

* subversion/libsvn_wc/entries.c: Remove stuttering.

* subversion/libsvn_wc/merge.c: Remove stuttering.

* subversion/libsvn_wc/props.c: Remove stuttering.

* subversion/libsvn_wc/status.c: Remove stuttering.

* subversion/libsvn_wc/update_editor.c: Remove stuttering.

* subversion/svnlook/main.c: Remove stuttering.

* subversion/tests/README: Remove stuttering.

* subversion/tests/clients/cmdline/ Remove stuttering.

* subversion/tests/clients/cmdline/ Remove stuttering.

* subversion/tests/clients/cmdline/svntest/ Remove stuttering.

* subversion/tests/clients/cmdline/svntest/ Remove stuttering.

* subversion/tests/clients/cmdline/ Remove stuttering.

* tools/client-side/ Remove stuttering.

* tools/hook-scripts/commit-access-control.cfg: Remove stuttering.

* www/project_tasks.html: Remove stuttering.

* www/testing-goals.html: Remove stuttering.

  1. … 39 more files in changeset.

Removing obsolete documentation (after first brushing away cobwebs.)

"Nobody goes in there, son..."

* doc/user/svnlook, doc/user/manual, doc/user/svn_for_cvs_users,

doc/user/quickref, doc/user/svn_intro: delete these old crufty


* doc/user/lj_article.txt: copied & renamed from doc/user/svn_intro/.

* doc/user/svn-ref.tex: copied out from doc/user/quickref

* README: update descriptions of our docs.

    • ?
  1. … 4 more files in changeset.
Doc fixes.

Patch by: Nick Duffek <>

* svn_for_cvs_users.texi: error fixes. Also, let's make this file

compilable by texi2dvi and texi2html!

    • -18
    • +17
* svn-ref.tex: remove empty notes column.
* svn-ref.tex: new quick reference card, adapted from the old CVS one
    • -0
    • +249

The contract with Linux Journal is up, so I hereby reclaim the

Subversion article, and hereby donate it to the project's

documentation. Whee.

    • -0
    • +323
Remove spurious whitespace from all lists not fixed in rev 1431:

* subversion/doc/programmer/design/architecture.texi

(Network Layer): Unindent.

* subversion/doc/programmer/design/client.texi

(The working copy management library): Same.

(The repository access library): Same.

(The client operation library): Same.

* subversion/doc/programmer/design/deltas.texi

(Serializing Deltas via the "Editor" Interface): Same.

* subversion/doc/programmer/design/future.texi

(User Interface for Branches and Tags): Same.

* subversion/doc/programmer/design/server.texi

(Filesystem Overview): Same.

(Bubble-Up Method): Same.

(Username Authentication): Same.

(Authorization): Same.

* subversion/doc/user/svn_for_cvs_users/svn_for_cvs_users.texi

(Distinction between 'status' and 'update'): Same.

(Conflicts): Same.

    • -8
    • +8
  1. … 5 more files in changeset.
Apply the rest of Martin Buchholz <>'s doc patch, the

first part of which was applied in r1410.

Patch by: Martin Buchholz <>

* subversion/doc/programmer/design/server.texi

(Implementation): Remove spurious indentation from itemized list,

because it was visible in Info.

* subversion/doc/user/svn_for_cvs_users/svn_for_cvs_users.texi

(More "disconnected" operations): Same.

(Directory versioning): Same.

    • -12
    • +12
  1. … 1 more file in changeset.
Typo fixes.

Patch by: Martin Buchholz <>

(Remainder of his patch applied in r1431.)

* subversion/doc/programmer/design/future.texi (SMTP access)

* subversion/doc/programmer/design/architecture.texi (Network Layer)

* subversion/doc/programmer/design/goals.texi (Goals)

* subversion/doc/user/manual/removals.texi (Removing items)

* subversion/doc/user/manual/model.texi (Properties)

* subversion/doc/user/manual/dirversioning.texi (Revisions,

The Lagging Directory)

* subversion/doc/programmer/design/server.texi (Server Library,

Username Authentication, Authorization)

* subversion/doc/user/svn_for_cvs_users/svn_for_cvs_users.texi

(Branches and tags)

    • -1
    • +1
  1. … 4 more files in changeset.
* doc/user/svn_for_cvs_users/svn_for_cvs_users.texi: Add new section

on differences in committing between CVS and SVN.

    • -0
    • +19
Patches very similar to those submitted by Mark Benedetto King

<> (I started writing this code on the train

before realizing someone else was already doing it). I'm using

apr_strtok though to hopefully solve the newline "issue".

* subversion/include/svn_types.h

(SVN_PROP_IGNORE): New #define for ignore patterns.

* subversion/libsvn_wc/wc.h

(SVN_WC_SVNIGNORE): Removed obsolete #define.

* subversion/libsvn_wc/adm_crawler.c

(add_ignore_patterns): New function.

(load_ignore_file): Removed obsolete function.

(report_revisions): Use new add_ignore_patterns() instead of


* .

* ac-helpers

* doc

* doc/programmer/design

* doc/user/manual

* doc/user/svn_for_cvs_users

* expat-lite

* subversion/bindings/guile

* subversion/bindings/java

* subversion/bindings/java/jni/org/tigris/subversion

* subversion/bindings/java/jni/org/tigris/subversion/lib

* subversion/bindings/perl

* subversion/bindings/python

* subversion/bindings/ruby

* subversion/bindings/tcl

* subversion/clients/cmdline

* subversion/clients/win32/svn_com

* subversion/include

* subversion/libsvn_client

* subversion/libsvn_delta

* subversion/libsvn_fs

* subversion/libsvn_ra

* subversion/libsvn_ra_dav

* subversion/libsvn_ra_local

* subversion/libsvn_repos

* subversion/libsvn_subr

* subversion/libsvn_wc

* subversion/mod_dav_svn

* subversion/svnadmin

* subversion/svnlook

* subversion/tests

* subversion/tests/clients/cmdline

* subversion/tests/clients/cmdline/svntest

* subversion/tests/clients/cmdline/xmltests

* subversion/tests/libsvn_delta

* subversion/tests/libsvn_fs

* subversion/tests/libsvn_ra_local

* subversion/tests/libsvn_repos

* subversion/tests/libsvn_subr

* subversion/tests/libsvn_wc

* tools/hook-scripts

* www

svn:ignore property set on these directories, based on the

respective contents of...

* .svnignore

* ac-helpers/.svnignore

* doc/.svnignore

* doc/programmer/design/.svnignore

* doc/user/manual/.svnignore

* doc/user/svn_for_cvs_users/.svnignore

* expat-lite/.svnignore

* subversion/bindings/guile/.svnignore

* subversion/bindings/java/.svnignore

* subversion/bindings/java/jni/org/tigris/subversion/.svnignore

* subversion/bindings/java/jni/org/tigris/subversion/lib/.svnignore

* subversion/bindings/perl/.svnignore

* subversion/bindings/python/.svnignore

* subversion/bindings/ruby/.svnignore

* subversion/bindings/tcl/.svnignore

* subversion/clients/cmdline/.svnignore

* subversion/clients/win32/svn_com/.svnignore

* subversion/include/.svnignore

* subversion/libsvn_client/.svnignore

* subversion/libsvn_delta/.svnignore

* subversion/libsvn_fs/.svnignore

* subversion/libsvn_ra/.svnignore

* subversion/libsvn_ra_dav/.svnignore

* subversion/libsvn_ra_local/.svnignore

* subversion/libsvn_repos/.svnignore

* subversion/libsvn_subr/.svnignore

* subversion/libsvn_wc/.svnignore

* subversion/mod_dav_svn/.svnignore

* subversion/svnadmin/.svnignore

* subversion/svnlook/.svnignore

* subversion/tests/.svnignore

* subversion/tests/clients/cmdline/.svnignore

* subversion/tests/clients/cmdline/svntest/.svnignore

* subversion/tests/clients/cmdline/xmltests/.svnignore

* subversion/tests/libsvn_delta/.svnignore

* subversion/tests/libsvn_fs/.svnignore

* subversion/tests/libsvn_ra_local/.svnignore

* subversion/tests/libsvn_repos/.svnignore

* subversion/tests/libsvn_subr/.svnignore

* subversion/tests/libsvn_wc/.svnignore

* tools/hook-scripts/.svnignore

* www/.svnignore

...these files, which are now removed from revision control.

  1. … 83 more files in changeset.
Fixed documentation to point to .svn directory instead of SVN directory.
  1. … 4 more files in changeset.
Need an .svnignore in new directory.
    • -0
    • +6

* svn_for_cvs_users.texi: convert to texinfo from text

* add new document to doc-target

    • -0
    • +426
  1. … 1 more file in changeset.
Some badly needed documentation for CVS users.
Remove `unadd' and `undelete' subcommands.

Also, delegate the tasks once done by `unadd' and `undelete' to

`revert.' Note: `revert' is far from finished, far from refined (far

from crash-proof...ugh)

Patch by: Mo DeJong <>


* subversion/include/svn_wc.h

(svn_wc_schedule_t): Removed unadd and undelete actions.

(svn_wc_unadd, svn_wc_undelete): Removed functions.

(svn_wc_revert): Added RECURSIVE argument.

* subversion/include/svn_client.h

(svn_client_unadd, svn_client_undelete): Removed functions.

(svn_client_revert): Added RECURSIVE field.

* subversion/include/svn_pools.h

(svn_pool_feedback_t): Removed report_unadded_item() and

report_undeleted_item() vtable entries.

* subversion/libsvn_wc/adm_ops.c

(mark_tree): This function no longer concerns itself with unadds and

undeletes (since they don't exist).

(add_to_revision_control): New function combining old contents of

svn_wc_add_directory() and svn_wc_add_file(). Replacements where

the node type changes are currently disallowed.

(svn_wc_add_directory, svn_wc_add_file): Now use

add_to_revision_control helper function.

(svn_wc_unadd, svn_wc_undelete): Removed functions.

(revert_admin_things): New helper function.

(svn_wc_revert): More work on this function to support directories,

and to start taking on the jobs of the now-absent unadd and undelete


* subversion/libsvn_subr/svn_error.c

(report_unadded_item, report_undeleted_item): Removed these default

callback functions.

(report_reversion, report_restoration): New functions.

(svn_error_init_pool): Don't initialize unadd and undelete

callbacks, since they no longer exist. Do initialize reversion, and

restoration callbacks.

* subversion/libsvn_client/delete.c

(svn_client_undelete): Removed function.

* subversion/libsvn_client/add.c

(svn_client_unadd): Removed function.

* subversion/clients/cmdline/cl.h

(svn_cl__unadd, svn_cl__undelete): Removed functions.

* subversion/clients/cmdline/add-cmd.c

(svn_cl__unadd): Removed function.

* subversion/clients/cmdline/delete-cmd.c

(svn_cl__undelete): Removed function.

* subversion/clients/cmdline/feedback.c

(report_unadded_item, report_undeleted_item): Removed functions.

(svn_cl__init_feedback_vtable): No longer using unadd and undelete

feedback functions.

* subversion/clients/cmdline/main.c:

(svn_cl__cmd_table): Removed unadd and undelete command table entries.

* subversion/bindings/java/jni/org/tigris/subversion/lib/

(unadd, undelete): Removed functions.

* subversion/bindings/java/jni/org/tigris/subversion/lib/

(unadd, undelete): Removed functions.

* doc/user/svn_for_cvs_users.txt:

* doc/user/manual/adds.texi:

* subversion/tests/clients/cmdline/

Documentation and docstring cleanups. No more unadd and undelete commands.

* subversion/libsvn_wc/entries.c

(check_entries, fold_state_changes): Updated to reflect now-absent

unadd and undelete schedules.

* subversion/clients/cmdline/revert-cmd.c

(svn_cl__revert): Now supports recursion!

* subversion/libsvn_client/revert.c

(svn_client_revert): Now supports recursion!

* subversion/libsvn_wc/wc.h

Remove some cruft from days gone by...

  1. … 19 more files in changeset.
Outline of new doc.
    • -0
    • +61
Don't show compiled docs when updating.
  1. … 1 more file in changeset.
Documentation fixes.

Patch by: C. Scott Ananian <>

* adds.texi

Correct a typo: when commiting 'fonts' in the example, the

second file added should be 'file2' not 'file1'.

* dirversioning.texi

Correct the attribution of a quote; fix the spelling of 'contradictory'.

Commit artefacts of the CVS-to-Subversion conversion process.
  1. … 7 more files in changeset.