-=[ Mr. Bumblebee ]=-
_Indonesia_
$vNc @ s d d l Z d d l m Z m Z d d l m Z m Z d d l m Z d e j f d YZ
d Z d e j f d YZ e
d
d d d
d d d d d d d d d d d d Z d S( iN( t merget tests( t featurest script( t po_merget BlackboxTestPoMergerc B s/ e Z e j g Z d Z d Z d Z RS( c C sE t t | j t | d | _ t j j j d t j
d d S( Nt addusert merge_file_contents .po file merge( t superR t setUpt make_adduser_brancht builderR t Mergert hookst install_named_hookR t
po_merge_hook( t self( ( sO /usr/lib/python2.7/dist-packages/bzrlib/plugins/po_merge/tests/test_po_merge.pyR # s c C s | j d d S( Ns $ bzr branch adduser -rrevid:this work
2>Branched 2 revisions.
$ cd work
$ bzr merge ../adduser -rrevid:other
2> M po/adduser.pot
2> M po/fr.po
2>Text conflict in po/adduser.pot
2>1 conflicts encountered.
( t
run_script( R ( ( sO /usr/lib/python2.7/dist-packages/bzrlib/plugins/po_merge/tests/test_po_merge.pyt- test_merge_with_hook_gives_unexpected_results+ s c C sG | j d t d d } | j t d Wd QX| j d d S( Ns $ bzr branch adduser -rrevid:this work
2>Branched 2 revisions.
$ cd work
# set po_dirs to an empty list
$ bzr merge ../adduser -rrevid:other -Opo_merge.po_dirs=
2> M po/adduser.pot
2> M po/fr.po
2>Text conflict in po/adduser.pot
2>Text conflict in po/fr.po
2>2 conflicts encountered.
s po/adduser.pott wt resolved_pots $ bzr resolve po/adduser.pot
2>1 conflict resolved, 1 remaining
# Use remerge to trigger the hook, we use the default config options here
$ bzr remerge po/*.po
2>All changes applied successfully.
# There should be no conflicts anymore
$ bzr conflicts
( R t opent writet _Adduser( R t f( ( sO /usr/lib/python2.7/dist-packages/bzrlib/plugins/po_merge/tests/test_po_merge.pyt test_called_on_remerge: s ( t __name__t
__module__R t msgmerge_featuret _test_needs_featuresR R R ( ( ( sO /usr/lib/python2.7/dist-packages/bzrlib/plugins/po_merge/tests/test_po_merge.pyR s c C s | j | } | j | j d d d d f d d f d d d d
t d f f d d d
d
t d f f g | j d d g d d t d f f d d
t d f f g | j d d g d d t d f f d d
t d f f g | j | S( s Helper for po_merge blackbox tests.
This creates a branch containing the needed base revisions so tests can
attempt merges and conflict resolutions.
t baset addt s root-idt directoryt pos dir-ids po/adduser.pots pot-idt filet base_pots po/fr.pos po-idt base_pot othert modifyt other_pott other_pot thist this_pott this_poN( R s root-idR! R ( R"