Rev 4930: (vila) Cleanup conflicts docs in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4930 [merge]
revision-id: pqm at pqm.ubuntu.com-20100104175649-lb0fpgzbuyu91ltv
parent: pqm at pqm.ubuntu.com-20100104054001-iwx19b3mp8igu88x
parent: v.ladeuil+lp at free.fr-20100104171456-7ko1aczmbw9t8rm1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2010-01-04 17:56:49 +0000
message:
  (vila) Cleanup conflicts docs
added:
  bzrlib/help_topics/es/         bzrlibhelp_topicses-20100104142927-3zk9dhyzgw3dqtkl-1
renamed:
  doc/es/user-guide/resolving_conflicts.txt => bzrlib/help_topics/es/conflicts.txt conflicts.txt-20080504181626-aqnzjwfhpju5ypfe-1
modified:
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
  bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
  doc/es/user-guide/index-plain.txt indexplain.txt-20090909124424-llpj39uuk9509qhi-1
  doc/es/user-guide/index.txt    index.txt-20080512005856-hgdxkh9xo58n7zdp-2
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2009-11-23 03:15:33 +0000
+++ b/bzrlib/conflicts.py	2009-12-10 17:03:48 +0000
@@ -148,9 +148,9 @@
 
 
 def restore(filename):
-    """\
-    Restore a conflicted file to the state it was in before merging.
-    Only text restoration supported at present.
+    """Restore a conflicted file to the state it was in before merging.
+
+    Only text restoration is supported at present.
     """
     conflicted = False
     try:
@@ -478,7 +478,7 @@
 
 
 class UnversionedParent(HandledConflict):
-    """An attempt to version an file whose parent directory is not versioned.
+    """An attempt to version a file whose parent directory is not versioned.
     Typically, the result of a merge where one tree unversioned the directory
     and the other added a versioned file to it.
     """

=== modified file 'bzrlib/help_topics/en/conflicts.txt'
--- a/bzrlib/help_topics/en/conflicts.txt	2009-11-25 16:42:55 +0000
+++ b/bzrlib/help_topics/en/conflicts.txt	2009-12-10 17:03:48 +0000
@@ -204,7 +204,7 @@
   Conflict: FILE.new is not a directory, but has files in it.
   Created directory.
 
-This happens when one side has added files to a directory, and the othe side
+This happens when one side has added files to a directory, and the other side
 has changed the directory into a file or symlink.  For example::
 
   $ bzr init

=== added directory 'bzrlib/help_topics/es'
=== renamed file 'doc/es/user-guide/resolving_conflicts.txt' => 'bzrlib/help_topics/es/conflicts.txt'
=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2009-12-10 15:10:36 +0000
+++ b/bzrlib/tests/test_conflicts.py	2010-01-04 14:56:59 +0000
@@ -22,9 +22,7 @@
     conflicts,
     errors,
     tests,
-    workingtree,
     )
-from bzrlib.tests import script
 
 
 # TODO: Test commit with some added, and added-but-missing files

=== modified file 'doc/es/user-guide/index-plain.txt'
--- a/doc/es/user-guide/index-plain.txt	2009-12-02 20:34:07 +0000
+++ b/doc/es/user-guide/index-plain.txt	2010-01-04 14:33:22 +0000
@@ -50,7 +50,7 @@
 .. include later - partner_intro.txt
 .. include later - branching_a_project.txt
 .. include later - merging_changes.txt
-.. include:: resolving_conflicts.txt
+.. include later - resolving_conflicts.txt
 .. include later - annotating_changes.txt
 
 

=== modified file 'doc/es/user-guide/index.txt'
--- a/doc/es/user-guide/index.txt	2009-12-02 20:34:07 +0000
+++ b/doc/es/user-guide/index.txt	2010-01-04 14:33:22 +0000
@@ -50,7 +50,7 @@
 .. include later - partner_intro.txt
 .. include later - branching_a_project.txt
 .. include later - merging_changes.txt
-.. include:: resolving_conflicts.txt
+.. include later - resolving_conflicts.txt
 .. include later - annotating_changes.txt