svn commit: r896068 - in /subversion/trunk: notes/tree-conflicts/use-cases.txt subversion/libsvn_wc/adm_crawler.c

[ju...@apache.org]

Author: julianfoad
Date: Tue Jan  5 14:41:41 2010
New Revision: 896068

URL: http://svn.apache.org/viewvc?rev=896068&view=rev
Log:
Fix a typo and perform minor formatting tweaks.

* notes/tree-conflicts/use-cases.txt
  Add some clarity by including the 'Developer' info and a minor
  formatting tweak.

* subversion/libsvn_wc/adm_crawler.c
  (report_revisions_and_depths): s/treate/treat/

Patch by: Kannan R <kannanr{_AT_}collab.net>

Modified:
    subversion/trunk/notes/tree-conflicts/use-cases.txt
    subversion/trunk/subversion/libsvn_wc/adm_crawler.c

Modified: subversion/trunk/notes/tree-conflicts/use-cases.txt
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/tree-conflicts/use-cases.txt?rev=896068&r1=896067&r2=896068&view=diff
==============================================================================
--- subversion/trunk/notes/tree-conflicts/use-cases.txt (original)
+++ subversion/trunk/notes/tree-conflicts/use-cases.txt Tue Jan  5 14:41:41 2010
@@ -245,7 +245,7 @@
 
    Developer B moves Foo.c to Bar.c and commits it to the repository.
    
-   Developer merges A's new revision into his working copy. The merge
+   Developer B merges A's new revision into his working copy. The merge
    will apply A's modification to Foo.c to the Foo.c in B's working
    copy.
 
@@ -320,11 +320,11 @@
 
 Current Behavior
 
-   Developer A  moves Foo.c to Bar.c and commits it to the repository.
+   Developer A moves Foo.c to Bar.c and commits it to the repository.
 
-   Developer B modifies Foo.cand commits it to the repository.
+   Developer B modifies Foo.c and commits it to the repository.
    
-   Developer merges A's new revision into his working copy.  The merge
+   Developer B merges A's new revision into his working copy.  The merge
    will add Bar.c (with the same content as the original Foo.c) and
    will delete B's Foo.c.
 
@@ -398,7 +398,7 @@
 
    Developer B moves Foo.c to Bix.c and commits it to the repository.
    
-   Developer merges A's new revision into his working copy.  The merge
+   Developer B merges A's new revision into his working copy.  The merge
    will add Bar.c with history in B's working copy.
 
 Problems With Current Behavior

Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=896068&r1=896067&r2=896068&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Tue Jan  5 14:41:41 2010
@@ -396,7 +396,7 @@
             {
               /* Report the excluded path, no matter whether report_everything
                  flag is set.  Because the report_everything flag indicates
-                 that the server will treate the wc as empty and thus push
+                 that the server will treat the wc as empty and thus push
                  full content of the files/subdirs. But we want to prevent the
                  server from pushing the full content of this_path at us. */