Ping. This submission has received no comments.
Gavin. On 23/12/2009, at 20:04 , Kannan wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > > 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 <kann...@collab.net> > > - -- > Thanks & Regards, > Kannan > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.6 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ > > iQEVAwUBSzHdBXlTqcY7ytmIAQLjcgf/SDkEdPKHSXuESKZgVdWMpz9F4Qd2ybma > 6fvvawbBvPcamwCoi1KyFk2EeM8wlcDX14OZ/Pq02MZnTw6dT9cTK9Xkjir10bU+ > O2ypP4CSxBgNqmvPhp0Nxllk5OOneaTQFDsHZ5cyTDX8hf4spdnX+7j9fZ6aQwEj > bmNDsCjxjiqSiDf3U5wrdmwHM/Zq5g6c+JvVm5Hw5qMi0mXtb7m9hx8Kk+QOkP9K > sVuotdN60Vq3uAw+Qpjd/n0P1D0Up0q6L1rQyUk5RJAsKR/V02fxiZ1NsvNFQi0G > 1F4xEWuwFx2lnoQ6qr89hyqw4Vp0Zwnyq6xcj1nSKD8he0Nf4bhiQw== > =B76C > -----END PGP SIGNATURE----- > Index: notes/tree-conflicts/use-cases.txt > =================================================================== > --- notes/tree-conflicts/use-cases.txt (revision 893084) > +++ notes/tree-conflicts/use-cases.txt (working copy) > @@ -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. > > @@ -322,9 +322,9 @@ > > 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 > Index: subversion/libsvn_wc/adm_crawler.c > =================================================================== > --- subversion/libsvn_wc/adm_crawler.c (revision 893084) > +++ subversion/libsvn_wc/adm_crawler.c (working copy) > @@ -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. */ >
