Skip to content
Snippets Groups Projects
Commit bc7a07fa authored by Hefee's avatar Hefee
Browse files

update README

parent 116c6163
No related branches found
No related tags found
No related merge requests found
...@@ -14,39 +14,16 @@ Add this to .gitattributes in some dir: ...@@ -14,39 +14,16 @@ Add this to .gitattributes in some dir:
### Testing ### Testing
run: ipython3 -i runtests.py To run the testsuite simply run runtests.py in the topdir.
In [18]: runTest("translated-remote") For each test there is a subfolder in the test dir with folling files:
Using custom PO merge driver (local; /tmp/merge-po.JIyZ) * base, local and remote - the 3 files for a 3-way merge
0 * merged - the file after the merge is done
0 * pot - the corresponding pot file, to get a cleaner picture for sorting and removal context.
to create such an file run:
In [19]: runTest("translated-local-and-remote") msghack --empty remote > pot
Using custom PO merge driver (local; /tmp/merge-po.lZsH)
0 you can simply look into the examples and run diff to see what is done.
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
### Documentation ### Documentation
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment