[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] typos to merge-tracking/notes/merge-tracking.txt

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2006-06-22 20:23:46 CEST

Hi All,
Find the attached patch.

With regards
Kamesh Jayachandran

[[[
Patch by: Kamesh Jayachandran <kamesh@collab.net>

* notes/merge-tracking.txt
  'director' to 'directory'
  'onw' to 'now'
  'posyou' to ', so you' (My Guess!!)
]]]

Index: notes/merge-tracking.txt
===================================================================
--- notes/merge-tracking.txt (revision 20217)
+++ notes/merge-tracking.txt (working copy)
@@ -34,7 +34,7 @@
 3. To be able to edit merge information in a human editable form.
 
 4. For the information to be stored in a space efficient manner, and to
-be able to determine the revisions merged into a given file/director in
+be able to determine the revisions merged into a given file/directory in
 a time efficient manner.
 
 5. Still getting a conservatively correct answer (not worse than what we
@@ -274,7 +274,7 @@
 Repeated merge with indirect info:
 Assume the repository is in the state it would be after the "Repeated
 merge" example.
-Assume additionally, we onw have a branch /branches/next-release, with
+Assume additionally, we now have a branch /branches/next-release, with
 revisions 20-24 on it.
 
 We wish to merge /branches/release into /branches/next-release.
@@ -355,7 +355,7 @@
 believe it is possible to end up with merge info in different places,
 or with slightly different revision lines that have the same semantic
 effect (IE info like /trunk:1-9 vs /trunk:1-8<newline>/trunk/bar:9
-when revision 9 on /trunk only affected /trunk/bar) posyou can end up
+when revision 9 on /trunk only affected /trunk/bar), so you can end up
 with merge info in different places, even though the semantic result
 will be the same in all cases.
 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 22 20:23:37 2006

This is an archived mail posted to the Subversion Dev mailing list.