From bc7a07fab4e89e5a164a173155752a72ca8b173a Mon Sep 17 00:00:00 2001
From: hefee <me@hefee.de>
Date: Thu, 22 Mar 2018 17:10:43 +0100
Subject: [PATCH] update README
---
README | 43 ++++++++++---------------------------------
1 file changed, 10 insertions(+), 33 deletions(-)
diff --git a/README b/README
index 483d080..c20b16a 100644
--- a/README
+++ b/README
@@ -14,39 +14,16 @@ Add this to .gitattributes in some dir:
### Testing
-run: ipython3 -i runtests.py
-
- In [18]: runTest("translated-remote")
- Using custom PO merge driver (local; /tmp/merge-po.JIyZ)
- 0
- 0
-
- In [19]: runTest("translated-local-and-remote")
- Using custom PO merge driver (local; /tmp/merge-po.lZsH)
- 0
- 0
-
-
- In [22]: runTest("confict")
- Using custom PO merge driver (local; /tmp/merge-po.7FoH)
- Conflict(s) detected
- between /tmp/merge-po.7FoH.local and /tmp/merge-po.7FoH.remote
- 1
- --- /tmp/tmp5cbetvbs/local 2018-03-22 16:40:55.000000000 +0100
- +++ tests/confict/merged 2018-03-22 16:40:51.954196950 +0100
- @@ -27,9 +27,9 @@
- "> **amnesia**, *noun*:<br/>\n"
- "> forgetfulness; loss of long-term memory.\n"
- msgstr ""
- -"#-#-#-#-# merge-po.7FoH.local-only (Tails) #-#-#-#-#\n"
- +"#-#-#-#-# merge-po.PE9w.local-only (Tails) #-#-#-#-#\n"
- "> Je ne sais pas \n"
- -"#-#-#-#-# merge-po.7FoH.remote-only (Tails) #-#-#-#-#\n"
- +"#-#-#-#-# merge-po.PE9w.remote-only (Tails) #-#-#-#-#\n"
- "Un deuxième traduction."
-
- #. type: Plain text
- 1
+To run the testsuite simply run runtests.py in the topdir.
+
+For each test there is a subfolder in the test dir with folling files:
+* base, local and remote - the 3 files for a 3-way merge
+* merged - the file after the merge is done
+* pot - the corresponding pot file, to get a cleaner picture for sorting and removal context.
+ to create such an file run:
+ msghack --empty remote > pot
+
+you can simply look into the examples and run diff to see what is done.
### Documentation
--
GitLab