Skip to content

Instantly share code, notes, and snippets.

/testrepo.dia

Created March 14, 2015 14:21
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save anonymous/3a81678c99f14d557a4e to your computer and use it in GitHub Desktop.
Save anonymous/3a81678c99f14d557a4e to your computer and use it in GitHub Desktop.
Download ZIP
testrepo git svn
Raw
testrepo.dia
<?xml version="1.0" encoding="UTF-8"?>
<dia:diagram xmlns:dia="http://www.lysator.liu.se/~alla/dia/">
<dia:diagramdata>
<dia:attribute name="background">
<dia:color val="#ffffff"/>
</dia:attribute>
<dia:attribute name="pagebreak">
<dia:color val="#000099"/>
</dia:attribute>
<dia:attribute name="paper">
<dia:composite type="paper">
<dia:attribute name="name">
<dia:string>#A4#</dia:string>
</dia:attribute>
<dia:attribute name="tmargin">
<dia:real val="2.8222000598907471"/>
</dia:attribute>
<dia:attribute name="bmargin">
<dia:real val="2.8222000598907471"/>
</dia:attribute>
<dia:attribute name="lmargin">
<dia:real val="2.8222000598907471"/>
</dia:attribute>
<dia:attribute name="rmargin">
<dia:real val="2.8222000598907471"/>
</dia:attribute>
<dia:attribute name="is_portrait">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="scaling">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="fitto">
<dia:boolean val="false"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="grid">
<dia:composite type="grid">
<dia:attribute name="width_x">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="width_y">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="visible_x">
<dia:int val="1"/>
</dia:attribute>
<dia:attribute name="visible_y">
<dia:int val="1"/>
</dia:attribute>
<dia:composite type="color"/>
</dia:composite>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#d8e5e5"/>
</dia:attribute>
<dia:attribute name="guides">
<dia:composite type="guides">
<dia:attribute name="hguides"/>
<dia:attribute name="vguides"/>
</dia:composite>
</dia:attribute>
</dia:diagramdata>
<dia:layer name="Background" visible="true" active="true">
<dia:object type="UML - Class" version="0" id="O0">
<dia:attribute name="obj_pos">
<dia:point val="4,2.55"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="3.95,2.5;11.79,4.8"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="4,2.55"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="7.7400000000000002"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="2.1999999999999997"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#myrepo_svn_WS#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="suppress_attributes">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="suppress_operations">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="visible_attributes">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="visible_operations">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="visible_comments">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="wrap_operations">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
<dia:attribute name="comment_line_length">
<dia:int val="17"/>
</dia:attribute>
<dia:attribute name="comment_tagging">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="line_width">
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="fill_color">
<dia:color val="#ffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
<dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
<dia:font family="monospace" style="8" name="Courier-Oblique"/>
</dia:attribute>
<dia:attribute name="classname_font">
<dia:font family="sans" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
<dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font_height">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="comment_font_height">
<dia:real val="0.69999999999999996"/>
</dia:attribute>
<dia:attribute name="attributes"/>
<dia:attribute name="operations"/>
<dia:attribute name="template">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
<dia:object type="UML - Class" version="0" id="O1">
<dia:attribute name="obj_pos">
<dia:point val="4.4375,16.6575"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="4.3875,16.6075;11.395,18.9075"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="4.4375,16.6575"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="6.9074999999999998"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="2.1999999999999997"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#myrepo_svnco#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="suppress_attributes">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="suppress_operations">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="visible_attributes">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="visible_operations">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="visible_comments">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="wrap_operations">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
<dia:attribute name="comment_line_length">
<dia:int val="17"/>
</dia:attribute>
<dia:attribute name="comment_tagging">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="line_width">
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#adadad"/>
</dia:attribute>
<dia:attribute name="fill_color">
<dia:color val="#ffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
<dia:color val="#adadad"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
<dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
<dia:font family="monospace" style="8" name="Courier-Oblique"/>
</dia:attribute>
<dia:attribute name="classname_font">
<dia:font family="sans" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
<dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font_height">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="comment_font_height">
<dia:real val="0.69999999999999996"/>
</dia:attribute>
<dia:attribute name="attributes"/>
<dia:attribute name="operations"/>
<dia:attribute name="template">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
<dia:object type="Standard - BezierLine" version="0" id="O2">
<dia:attribute name="obj_pos">
<dia:point val="4,3.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="1.10825,3.13353;4.4375,17.7803"/>
</dia:attribute>
<dia:attribute name="bez_points">
<dia:point val="4,3.25"/>
<dia:point val="-0.11025,4.00751"/>
<dia:point val="0.68975,17.4075"/>
<dia:point val="4.4375,17.3575"/>
</dia:attribute>
<dia:attribute name="corner_types">
<dia:enum val="0"/>
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="line_width">
<dia:real val="0.20000000298023224"/>
</dia:attribute>
<dia:attribute name="line_style">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="dashlength">
<dia:real val="0.29999999999999999"/>
</dia:attribute>
<dia:attribute name="end_arrow">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="end_arrow_length">
<dia:real val="0.5"/>
</dia:attribute>
<dia:attribute name="end_arrow_width">
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O0" connection="3"/>
<dia:connection handle="3" to="O1" connection="3"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Class" version="0" id="O3">
<dia:attribute name="obj_pos">
<dia:point val="9.0325,9.2775"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="8.9825,9.2275;16.195,12.1275"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="9.0325,9.2775"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="7.1124999999999998"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="2.7999999999999998"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#myrepo_gitsvn#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="suppress_attributes">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="suppress_operations">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="visible_attributes">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="visible_operations">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="visible_comments">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="wrap_operations">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
<dia:attribute name="comment_line_length">
<dia:int val="17"/>
</dia:attribute>
<dia:attribute name="comment_tagging">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="line_width">
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="fill_color">
<dia:color val="#ffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
<dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
<dia:font family="monospace" style="8" name="Courier-Oblique"/>
</dia:attribute>
<dia:attribute name="classname_font">
<dia:font family="sans" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
<dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font_height">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="comment_font_height">
<dia:real val="0.69999999999999996"/>
</dia:attribute>
<dia:attribute name="attributes">
<dia:composite type="umlattribute">
<dia:attribute name="name">
<dia:string>#origingit#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="operations"/>
<dia:attribute name="template">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O4">
<dia:attribute name="obj_pos">
<dia:point val="7.89125,16.6575"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="7.54008,4.6382;8.20188,16.7076"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
<dia:point val="7.89125,16.6575"/>
<dia:point val="7.87,4.75"/>
</dia:attribute>
<dia:attribute name="numcp">
<dia:int val="1"/>
</dia:attribute>
<dia:attribute name="line_style">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="end_arrow">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="end_arrow_length">
<dia:real val="0.5"/>
</dia:attribute>
<dia:attribute name="end_arrow_width">
<dia:real val="0.5"/>
</dia:attribute>
<dia:attribute name="dashlength">
<dia:real val="0.29999999999999999"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O1" connection="1"/>
<dia:connection handle="1" to="O0" connection="6"/>
</dia:connections>
</dia:object>
<dia:object type="Standard - BezierLine" version="0" id="O5">
<dia:attribute name="obj_pos">
<dia:point val="4,3.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="2.25036,3.11006;9.0325,10.4494"/>
</dia:attribute>
<dia:attribute name="bez_points">
<dia:point val="4,3.25"/>
<dia:point val="-0.2923,6.45"/>
<dia:point val="4.7077,10.3"/>
<dia:point val="9.0325,9.9775"/>
</dia:attribute>
<dia:attribute name="corner_types">
<dia:enum val="0"/>
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="line_width">
<dia:real val="0.20000000298023224"/>
</dia:attribute>
<dia:attribute name="end_arrow">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="end_arrow_length">
<dia:real val="0.5"/>
</dia:attribute>
<dia:attribute name="end_arrow_width">
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O0" connection="3"/>
<dia:connection handle="3" to="O3" connection="3"/>
</dia:connections>
</dia:object>
<dia:object type="Standard - BezierLine" version="0" id="O6">
<dia:attribute name="obj_pos">
<dia:point val="12.5887,9.2775"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="7.87,4.75;12.6487,9.33748"/>
</dia:attribute>
<dia:attribute name="bez_points">
<dia:point val="12.5887,9.2775"/>
<dia:point val="11.9577,6.55"/>
<dia:point val="10.3577,7.35"/>
<dia:point val="7.87,4.75"/>
</dia:attribute>
<dia:attribute name="corner_types">
<dia:enum val="0"/>
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="end_arrow">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="end_arrow_length">
<dia:real val="0.5"/>
</dia:attribute>
<dia:attribute name="end_arrow_width">
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O3" connection="1"/>
<dia:connection handle="3" to="O0" connection="6"/>
</dia:connections>
</dia:object>
<dia:object type="UML - Class" version="0" id="O7">
<dia:attribute name="obj_pos">
<dia:point val="21.1825,10.4775"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="21.1325,10.4275;29.7975,13.3275"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="21.1825,10.4775"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="8.5649999999999995"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="2.7999999999999998"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#myrepo_git_LS.git#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="suppress_attributes">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="suppress_operations">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="visible_attributes">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="visible_operations">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="visible_comments">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="wrap_operations">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
<dia:attribute name="comment_line_length">
<dia:int val="17"/>
</dia:attribute>
<dia:attribute name="comment_tagging">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="line_width">
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="fill_color">
<dia:color val="#ffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
<dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
<dia:font family="monospace" style="8" name="Courier-Oblique"/>
</dia:attribute>
<dia:attribute name="classname_font">
<dia:font family="sans" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
<dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font_height">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="comment_font_height">
<dia:real val="0.69999999999999996"/>
</dia:attribute>
<dia:attribute name="attributes">
<dia:composite type="umlattribute">
<dia:attribute name="name">
<dia:string>#(bare)#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="operations"/>
<dia:attribute name="template">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O8">
<dia:attribute name="obj_pos">
<dia:point val="16.145,11.1775"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="16.095,10.8466;21.2325,11.5084"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
<dia:point val="16.145,11.1775"/>
<dia:point val="21.1825,11.1775"/>
</dia:attribute>
<dia:attribute name="numcp">
<dia:int val="1"/>
</dia:attribute>
<dia:attribute name="start_arrow">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="start_arrow_length">
<dia:real val="0.5"/>
</dia:attribute>
<dia:attribute name="start_arrow_width">
<dia:real val="0.5"/>
</dia:attribute>
<dia:attribute name="end_arrow">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="end_arrow_length">
<dia:real val="0.5"/>
</dia:attribute>
<dia:attribute name="end_arrow_width">
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O3" connection="9"/>
<dia:connection handle="1" to="O7" connection="3"/>
</dia:connections>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O9">
<dia:attribute name="obj_pos">
<dia:point val="-0.00120549,5.95"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="-0.0512842,5.89992;31.7977,6.05008"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
<dia:point val="-0.00120549,5.95"/>
<dia:point val="31.7476,6"/>
</dia:attribute>
<dia:attribute name="numcp">
<dia:int val="1"/>
</dia:attribute>
<dia:attribute name="line_style">
<dia:enum val="2"/>
</dia:attribute>
</dia:object>
<dia:object type="Standard - Line" version="0" id="O10">
<dia:attribute name="obj_pos">
<dia:point val="-0.0187055,15.5275"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="-0.0687842,15.4774;31.7802,15.6276"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
<dia:point val="-0.0187055,15.5275"/>
<dia:point val="31.7301,15.5775"/>
</dia:attribute>
<dia:attribute name="numcp">
<dia:int val="1"/>
</dia:attribute>
<dia:attribute name="line_style">
<dia:enum val="2"/>
</dia:attribute>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O11">
<dia:attribute name="obj_pos">
<dia:point val="25.1487,5.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="25.1487,4.4625;30.4487,5.45"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#web server#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="1.0583333395013104"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="25.1487,5.25"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#8a8a8a"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="valign">
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O12">
<dia:attribute name="obj_pos">
<dia:point val="25.0812,7.4275"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="25.0812,6.64;30.6562,7.6275"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#local server#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="1.0583333395013104"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="25.0812,7.4275"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#8a8a8a"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="valign">
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O13">
<dia:attribute name="obj_pos">
<dia:point val="26.7137,17.055"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="26.7137,16.2675;30.4887,17.255"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#local PC#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="1.0583333395013104"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="26.7137,17.055"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#8a8a8a"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="valign">
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O14">
<dia:attribute name="obj_pos">
<dia:point val="25.2137,15.105"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="25.2137,14.3175;30.7887,15.305"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#local server#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="1.0583333395013104"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="25.2137,15.105"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#8a8a8a"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="valign">
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
<dia:object type="UML - Class" version="0" id="O15">
<dia:attribute name="obj_pos">
<dia:point val="20.67,17.885"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="20.62,17.835;27.88,20.135"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="20.67,17.885"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="7.1600000000000001"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="2.1999999999999997"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#myrepo_git_wc#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="suppress_attributes">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="suppress_operations">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="visible_attributes">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="visible_operations">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="visible_comments">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="wrap_operations">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
<dia:attribute name="comment_line_length">
<dia:int val="17"/>
</dia:attribute>
<dia:attribute name="comment_tagging">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="line_width">
<dia:real val="0.10000000000000001"/>
</dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="fill_color">
<dia:color val="#ffffff"/>
</dia:attribute>
<dia:attribute name="text_color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
<dia:font family="monospace" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
<dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
<dia:font family="monospace" style="8" name="Courier-Oblique"/>
</dia:attribute>
<dia:attribute name="classname_font">
<dia:font family="sans" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
<dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font_height">
<dia:real val="1"/>
</dia:attribute>
<dia:attribute name="comment_font_height">
<dia:real val="0.69999999999999996"/>
</dia:attribute>
<dia:attribute name="attributes"/>
<dia:attribute name="operations"/>
<dia:attribute name="template">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
<dia:object type="Standard - BezierLine" version="0" id="O16">
<dia:attribute name="obj_pos">
<dia:point val="21.1825,11.1775"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="17.5132,11.0376;21.3224,19.0569"/>
</dia:attribute>
<dia:attribute name="bez_points">
<dia:point val="21.1825,11.1775"/>
<dia:point val="16.8902,14.3775"/>
<dia:point val="16.3452,18.9075"/>
<dia:point val="20.67,18.585"/>
</dia:attribute>
<dia:attribute name="corner_types">
<dia:enum val="0"/>
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="line_width">
<dia:real val="0.20000000298023224"/>
</dia:attribute>
<dia:attribute name="end_arrow">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="end_arrow_length">
<dia:real val="0.5"/>
</dia:attribute>
<dia:attribute name="end_arrow_width">
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O7" connection="3"/>
<dia:connection handle="3" to="O15" connection="3"/>
</dia:connections>
</dia:object>
<dia:object type="Standard - BezierLine" version="0" id="O17">
<dia:attribute name="obj_pos">
<dia:point val="24.25,17.885"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="24.1798,13.2775;25.5273,17.9552"/>
</dia:attribute>
<dia:attribute name="bez_points">
<dia:point val="24.25,17.885"/>
<dia:point val="25.3023,16.545"/>
<dia:point val="24.4023,15.845"/>
<dia:point val="25.465,13.2775"/>
</dia:attribute>
<dia:attribute name="corner_types">
<dia:enum val="0"/>
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="end_arrow">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="end_arrow_length">
<dia:real val="0.5"/>
</dia:attribute>
<dia:attribute name="end_arrow_width">
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O15" connection="1"/>
<dia:connection handle="3" to="O7" connection="6"/>
</dia:connections>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O18">
<dia:attribute name="obj_pos">
<dia:point val="17.2637,10.805"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="17.2637,10.28;21.1137,10.94"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#(post-update)#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="0" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="0.70555555966754024"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="17.2637,10.805"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="valign">
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O19">
<dia:attribute name="obj_pos">
<dia:point val="11.3962,6.9825"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="11.3962,6.441;14.3452,7.1505"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#(dcommit)#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="0" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="0.70555555966754024"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="11.3962,6.9825"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="valign">
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O20">
<dia:attribute name="obj_pos">
<dia:point val="3.27872,7.61"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="3.27872,7.085;5.63122,7.745"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#(rebase)#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="0" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="0.70555555966754024"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="3.27872,7.61"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="valign">
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O21">
<dia:attribute name="obj_pos">
<dia:point val="22.8787,16.66"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="22.8787,16.135;24.6862,16.795"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#(push)#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="0" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="0.70555555966754024"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="22.8787,16.66"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="valign">
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O22">
<dia:attribute name="obj_pos">
<dia:point val="18.5612,14.7375"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="18.5612,14.2125;20.0312,14.8725"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#(pull)#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="0" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="0.70555555966754024"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="18.5612,14.7375"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="valign">
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O23">
<dia:attribute name="obj_pos">
<dia:point val="8.17872,14.36"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="8.17872,13.8185;10.7702,14.528"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#(commit)#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="0" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="0.70555555966754024"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="8.17872,14.36"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="valign">
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
<dia:object type="Standard - Text" version="1" id="O24">
<dia:attribute name="obj_pos">
<dia:point val="1.91122,11.8375"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="1.91122,11.3125;4.33872,11.9725"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
<dia:string>#(update)#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="0" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="height">
<dia:real val="0.70555555966754024"/>
</dia:attribute>
<dia:attribute name="pos">
<dia:point val="1.91122,11.8375"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="alignment">
<dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="valign">
<dia:enum val="3"/>
</dia:attribute>
</dia:object>
</dia:layer>
</dia:diagram>
Raw
testrepo.sh
set -x
rm -rf /tmp/myrepo*
cd /tmp
echo "simulating svn web server repo"
svnadmin create myrepo_svn_WS
# svn co file:///tmp/myrepo_svn_WS myrepo_svnco
read -s -p "Enter ssh pass [note, you will be prompted again via GUI for the same]: " SSHPASS
export SSHPASS
# note: the next command will again prompt for sshpass in GUI once, regardless of the SSHPASS variable
sshpass -e svn co svn+ssh://localhost/tmp/myrepo_svn_WS myrepo_svnco
cd /tmp/myrepo_svnco
echo "Adding first commits via svn"
echo aaa > AA.txt
svn add AA.txt
sshpass -e svn ci -m 'first svn commit'
echo bbb > BB.txt
svn add BB.txt
sshpass -e svn ci -m '2nd svn commit'
echo ccc > CC.txt
svn add CC.txt
sshpass -e svn ci -m '3rd svn commit'
echo ddd > DD.txt
svn add DD.txt
sshpass -e svn ci -m '4th svn commit'
echo eee > EE.txt
svn add EE.txt
sshpass -e svn ci -m '5th svn commit'
cd /tmp
echo "Cloning svn as git"
sshpass -e git svn clone svn+ssh://localhost/tmp/myrepo_svn_WS myrepo_gitsvn
echo "Cloning a bare git local server"
git clone --bare myrepo_gitsvn myrepo_git_LS.git
echo "Adding a git local server remote to the gitsvn"
cd /tmp/myrepo_gitsvn
git remote add origingit file:///tmp/myrepo_git_LS.git
cd /tmp
cat > /tmp/myrepo_git_LS.git/hooks/post-update <<EOF
#!/usr/bin/env bash
export SSHPASS=${SSHPASS}
#export GIT_DIR="."
git update-server-info
export GIT_DIR=".git"
echo "post-update kicking in"
cd /tmp/myrepo_gitsvn
git pull --rebase origingit master
git log --graph --decorate --pretty=oneline --abbrev-commit --all --date-order
sshpass -e git svn rebase
sshpass -e git svn dcommit
sshpass -e git svn rebase
git log --graph --decorate --pretty=oneline --abbrev-commit --all --date-order
EOF
chmod +x /tmp/myrepo_git_LS.git/hooks/post-update
cd /tmp
echo "Cloning a git local server to git local working copy"
sshpass -e git clone ssh://localhost/tmp/myrepo_git_LS.git myrepo_git_wc
cd /tmp/myrepo_git_wc
echo "Working from git local working copy now"
git config user.name me
git config user.email me@myself.com
mkdir folder
echo hhh > folder/file.txt
git add folder/file.txt
git commit -m "1st git commit"
sshpass -e git push origin master
echo iiii >> folder/file.txt
git add folder/file.txt
git commit -m "2nd git commit"
sshpass -e git push origin master
echo "Simulating svn server offline; git wc commits get added"
mv /tmp/myrepo_svn_WS /tmp/.myrepo_svn_WS
echo jjj >> folder/file.txt
echo jjj > folder/file2.txt
git add folder/file*.txt
git commit -m "3rd git commit"
sshpass -e git push origin master
echo kkkk >> folder/file.txt
echo kkkk >> folder/file2.txt
git add folder/file*.txt
git commit -m "4th git commit"
sshpass -e git push origin master
echo "Simulating svn server back online; git wc commits get added"
mv /tmp/.myrepo_svn_WS /tmp/myrepo_svn_WS
#~ echo "Simulating merge conflict via git fetch"
#~ (cd /tmp/myrepo_gitsvn; git fetch origingit)
echo lll >> folder/file.txt
git add folder/file.txt
git commit -m "5th git commit"
sshpass -e git push origin master
echo mmm >> folder/file.txt
git add folder/file.txt
git commit -m "6th git commit"
sshpass -e git push origin master
Raw
testrepo_fail.log
+ rm -rf /tmp/myrepo_git_LS.git /tmp/myrepo_gitsvn /tmp/myrepo_git_wc /tmp/myrepo_svnco /tmp/myrepo_svn_WS
+ cd /tmp
+ echo 'simulating svn web server repo'
simulating svn web server repo
+ svnadmin create myrepo_svn_WS
+ read -s -p 'Enter ssh pass [note, you will be prompted again via GUI for the same]: ' SSHPASS
Enter ssh pass [note, you will be prompted again via GUI for the same]: + export SSHPASS
+ sshpass -e svn co svn+ssh://localhost/tmp/myrepo_svn_WS myrepo_svnco
svn: Caught signal
+ cd /tmp/myrepo_svnco
+ echo 'Adding first commits via svn'
Adding first commits via svn
+ echo aaa
+ svn add AA.txt
A AA.txt
+ sshpass -e svn ci -m 'first svn commit'
Adding AA.txt
Transmitting file data .
Committed revision 1.
+ echo bbb
+ svn add BB.txt
A BB.txt
+ sshpass -e svn ci -m '2nd svn commit'
Adding BB.txt
Transmitting file data .
Committed revision 2.
+ echo ccc
+ svn add CC.txt
A CC.txt
+ sshpass -e svn ci -m '3rd svn commit'
Adding CC.txt
Transmitting file data .
Committed revision 3.
+ echo ddd
+ svn add DD.txt
A DD.txt
+ sshpass -e svn ci -m '4th svn commit'
Adding DD.txt
Transmitting file data .
Committed revision 4.
+ echo eee
+ svn add EE.txt
A EE.txt
+ sshpass -e svn ci -m '5th svn commit'
Adding EE.txt
Transmitting file data .
Committed revision 5.
+ cd /tmp
+ echo 'Cloning svn as git'
Cloning svn as git
+ sshpass -e git svn clone svn+ssh://localhost/tmp/myrepo_svn_WS myrepo_gitsvn
Initialized empty Git repository in /tmp/myrepo_gitsvn/.git/
A AA.txt
r1 = 1d218b3853ae298b2c988812ee186a159f15b298 (refs/remotes/git-svn)
A BB.txt
r2 = 6739be35da48b7ed2fdd955f0d14b369e1852822 (refs/remotes/git-svn)
A CC.txt
r3 = 894eae9880c23a9f5dc71eed0a8eba1f6280c95a (refs/remotes/git-svn)
A DD.txt
r4 = 1c6e678e91154c57ca99606148176749484456de (refs/remotes/git-svn)
A EE.txt
r5 = 4f10c9d69d627ef40a17e41ff5f1d23b3094af2b (refs/remotes/git-svn)
Checked out HEAD:
svn+ssh://localhost/tmp/myrepo_svn_WS r5
+ echo 'Cloning a bare git local server'
Cloning a bare git local server
+ git clone --bare myrepo_gitsvn myrepo_git_LS.git
Cloning into bare repository 'myrepo_git_LS.git'...
done.
+ echo 'Adding a git local server remote to the gitsvn'
Adding a git local server remote to the gitsvn
+ cd /tmp/myrepo_gitsvn
+ git remote add origingit file:///tmp/myrepo_git_LS.git
+ cd /tmp
+ cat
+ chmod +x /tmp/myrepo_git_LS.git/hooks/post-update
+ cd /tmp
+ echo 'Cloning a git local server to git local working copy'
Cloning a git local server to git local working copy
+ sshpass -e git clone ssh://localhost/tmp/myrepo_git_LS.git myrepo_git_wc
Cloning into 'myrepo_git_wc'...
+ cd /tmp/myrepo_git_wc
+ echo 'Working from git local working copy now'
Working from git local working copy now
+ git config user.name me
+ git config user.email me@myself.com
+ mkdir folder
+ echo hhh
+ git add folder/file.txt
+ git commit -m '1st git commit'
[master 3f605fd] 1st git commit
1 file changed, 1 insertion(+)
create mode 100644 folder/file.txt
+ sshpass -e git push origin master
remote: post-update kicking in
remote: From file:///tmp/myrepo_git_LS
remote: * branch master -> FETCH_HEAD
remote: First, rewinding head to replay your work on top of it...
remote: Fast-forwarded master to 3f605fd526df29d66f3408d55b0a66577fed7489.
remote: * 3f605fd (HEAD, master) 1st git commit
remote: * 4f10c9d (git-svn) 5th svn commit
remote: * 1c6e678 4th svn commit
remote: * 894eae9 3rd svn commit
remote: * 6739be3 2nd svn commit
remote: * 1d218b3 first svn commit
remote: Current branch master is up to date.
remote: Committing to svn+ssh://localhost/tmp/myrepo_svn_WS ...
remote: A folder/file.txt
remote: Committed r6
remote: A folder/file.txt
remote: r6 = 935cb94b6b09acde825cb03c3775a2c1395c1a72 (refs/remotes/git-svn)
remote: No changes between current HEAD and refs/remotes/git-svn
remote: Resetting to the latest refs/remotes/git-svn
remote: Current branch master is up to date.
remote: * 935cb94 (HEAD, git-svn, master) 1st git commit
remote: * 4f10c9d 5th svn commit
remote: * 1c6e678 4th svn commit
remote: * 894eae9 3rd svn commit
remote: * 6739be3 2nd svn commit
remote: * 1d218b3 first svn commit
To ssh://localhost/tmp/myrepo_git_LS.git
4f10c9d..3f605fd master -> master
+ echo iiii
+ git add folder/file.txt
+ git commit -m '2nd git commit'
[master 0cf5d73] 2nd git commit
1 file changed, 1 insertion(+)
+ sshpass -e git push origin master
remote: post-update kicking in
remote: From file:///tmp/myrepo_git_LS
remote: * branch master -> FETCH_HEAD
remote: First, rewinding head to replay your work on top of it...
remote: * 0cf5d73 (HEAD, master) 2nd git commit
remote: | * 935cb94 (git-svn) 1st git commit
remote: * | 3f605fd 1st git commit
remote: |/
remote: * 4f10c9d 5th svn commit
remote: * 1c6e678 4th svn commit
remote: * 894eae9 3rd svn commit
remote: * 6739be3 2nd svn commit
remote: * 1d218b3 first svn commit
remote: First, rewinding head to replay your work on top of it...
remote: Applying: 2nd git commit
remote: Committing to svn+ssh://localhost/tmp/myrepo_svn_WS ...
remote: M folder/file.txt
remote: Committed r7
remote: M folder/file.txt
remote: r7 = 374031f221f92a8a20f74a5853224934aea94a73 (refs/remotes/git-svn)
remote: No changes between current HEAD and refs/remotes/git-svn
remote: Resetting to the latest refs/remotes/git-svn
remote: Current branch master is up to date.
remote: * 374031f (HEAD, git-svn, master) 2nd git commit
remote: * 935cb94 1st git commit
remote: * 4f10c9d 5th svn commit
remote: * 1c6e678 4th svn commit
remote: * 894eae9 3rd svn commit
remote: * 6739be3 2nd svn commit
remote: * 1d218b3 first svn commit
To ssh://localhost/tmp/myrepo_git_LS.git
3f605fd..0cf5d73 master -> master
+ echo 'Simulating svn server offline; git wc commits get added'
Simulating svn server offline; git wc commits get added
+ mv /tmp/myrepo_svn_WS /tmp/.myrepo_svn_WS
+ echo jjj
+ echo jjj
+ git add folder/file2.txt folder/file.txt
+ git commit -m '3rd git commit'
[master 50fce36] 3rd git commit
2 files changed, 2 insertions(+)
create mode 100644 folder/file2.txt
+ sshpass -e git push origin master
remote: post-update kicking in
remote: From file:///tmp/myrepo_git_LS
remote: * branch master -> FETCH_HEAD
remote: First, rewinding head to replay your work on top of it...
remote: * 50fce36 (HEAD, master) 3rd git commit
remote: | * 374031f (git-svn) 2nd git commit
remote: * | 0cf5d73 2nd git commit
remote: | * 935cb94 1st git commit
remote: * | 3f605fd 1st git commit
remote: |/
remote: * 4f10c9d 5th svn commit
remote: * 1c6e678 4th svn commit
remote: * 894eae9 3rd svn commit
remote: * 6739be3 2nd svn commit
remote: * 1d218b3 first svn commit
remote: Couldn't find a repository: No repository found in 'svn+ssh://localhost/tmp/myrepo_svn_WS' at /usr/lib/git-core/git-svn line 2693
remote:
remote: Committing to svn+ssh://localhost/tmp/myrepo_svn_WS ...
remote: Couldn't find a repository: No repository found in 'svn+ssh://localhost/tmp/myrepo_svn_WS' at /usr/lib/git-core/git-svn line 920
remote:
remote: Couldn't find a repository: No repository found in 'svn+ssh://localhost/tmp/myrepo_svn_WS' at /usr/lib/git-core/git-svn line 2693
remote:
remote: * 50fce36 (HEAD, master) 3rd git commit
remote: | * 374031f (git-svn) 2nd git commit
remote: * | 0cf5d73 2nd git commit
remote: | * 935cb94 1st git commit
remote: * | 3f605fd 1st git commit
remote: |/
remote: * 4f10c9d 5th svn commit
remote: * 1c6e678 4th svn commit
remote: * 894eae9 3rd svn commit
remote: * 6739be3 2nd svn commit
remote: * 1d218b3 first svn commit
To ssh://localhost/tmp/myrepo_git_LS.git
0cf5d73..50fce36 master -> master
+ echo kkkk
+ echo kkkk
+ git add folder/file2.txt folder/file.txt
+ git commit -m '4th git commit'
[master e843c18] 4th git commit
2 files changed, 2 insertions(+)
+ sshpass -e git push origin master
remote: post-update kicking in
remote: From file:///tmp/myrepo_git_LS
remote: * branch master -> FETCH_HEAD
remote: First, rewinding head to replay your work on top of it...
remote: Fast-forwarded master to e843c18979ebf5622c24b5691c8e787708358ab8.
remote: * e843c18 (HEAD, master) 4th git commit
remote: * 50fce36 3rd git commit
remote: | * 374031f (git-svn) 2nd git commit
remote: * | 0cf5d73 2nd git commit
remote: | * 935cb94 1st git commit
remote: * | 3f605fd 1st git commit
remote: |/
remote: * 4f10c9d 5th svn commit
remote: * 1c6e678 4th svn commit
remote: * 894eae9 3rd svn commit
remote: * 6739be3 2nd svn commit
remote: * 1d218b3 first svn commit
remote: Couldn't find a repository: No repository found in 'svn+ssh://localhost/tmp/myrepo_svn_WS' at /usr/lib/git-core/git-svn line 2693
remote:
remote: Committing to svn+ssh://localhost/tmp/myrepo_svn_WS ...
remote: Couldn't find a repository: No repository found in 'svn+ssh://localhost/tmp/myrepo_svn_WS' at /usr/lib/git-core/git-svn line 920
remote:
remote: Couldn't find a repository: No repository found in 'svn+ssh://localhost/tmp/myrepo_svn_WS' at /usr/lib/git-core/git-svn line 2693
remote:
remote: * e843c18 (HEAD, master) 4th git commit
remote: * 50fce36 3rd git commit
remote: | * 374031f (git-svn) 2nd git commit
remote: * | 0cf5d73 2nd git commit
remote: | * 935cb94 1st git commit
remote: * | 3f605fd 1st git commit
remote: |/
remote: * 4f10c9d 5th svn commit
remote: * 1c6e678 4th svn commit
remote: * 894eae9 3rd svn commit
remote: * 6739be3 2nd svn commit
remote: * 1d218b3 first svn commit
To ssh://localhost/tmp/myrepo_git_LS.git
50fce36..e843c18 master -> master
+ echo 'Simulating svn server back online; git wc commits get added'
Simulating svn server back online; git wc commits get added
+ mv /tmp/.myrepo_svn_WS /tmp/myrepo_svn_WS
+ echo 'Simulating merge conflict via git fetch'
Simulating merge conflict via git fetch
+ cd /tmp/myrepo_gitsvn
+ git fetch origingit
From file:///tmp/myrepo_git_LS
* [new branch] master -> origingit/master
+ echo lll
+ git add folder/file.txt
+ git commit -m '5th git commit'
[master cda116d] 5th git commit
1 file changed, 1 insertion(+)
+ sshpass -e git push origin master
remote: post-update kicking in
remote: From file:///tmp/myrepo_git_LS
remote: * branch master -> FETCH_HEAD
remote: First, rewinding head to replay your work on top of it...
remote: Fast-forwarded master to cda116dc33ce168c79b89b6bd99a5218af1525ae.
remote: * cda116d (HEAD, master) 5th git commit
remote: * e843c18 (origingit/master) 4th git commit
remote: * 50fce36 3rd git commit
remote: | * 374031f (git-svn) 2nd git commit
remote: * | 0cf5d73 2nd git commit
remote: | * 935cb94 1st git commit
remote: * | 3f605fd 1st git commit
remote: |/
remote: * 4f10c9d 5th svn commit
remote: * 1c6e678 4th svn commit
remote: * 894eae9 3rd svn commit
remote: * 6739be3 2nd svn commit
remote: * 1d218b3 first svn commit
remote: First, rewinding head to replay your work on top of it...
remote: Applying: 3rd git commit
remote: Applying: 4th git commit
remote: Applying: 5th git commit
remote: Committing to svn+ssh://localhost/tmp/myrepo_svn_WS ...
remote: M folder/file.txt
remote: A folder/file2.txt
remote: Committed r8
remote: A folder/file2.txt
remote: M folder/file.txt
remote: r8 = d1b3d2ee5850d4bb25e9a2b3de99d026e8414749 (refs/remotes/git-svn)
remote: No changes between current HEAD and refs/remotes/git-svn
remote: Resetting to the latest refs/remotes/git-svn
remote: Unstaged changes after reset:
remote: M folder/file.txt
remote: M folder/file2.txt
remote: M folder/file.txt
remote: M folder/file2.txt
remote: Committed r9
remote: M folder/file2.txt
remote: M folder/file.txt
remote: r9 = b1d542e664b138da6fb3a9ae82e04b2705fe37eb (refs/remotes/git-svn)
remote: No changes between current HEAD and refs/remotes/git-svn
remote: Resetting to the latest refs/remotes/git-svn
remote: Unstaged changes after reset:
remote: M folder/file.txt
remote: M folder/file.txt
remote: Committed r10
remote: M folder/file.txt
remote: r10 = 66e2e6b43d3eb8e336667fa5199d692404ae92f6 (refs/remotes/git-svn)
remote: No changes between current HEAD and refs/remotes/git-svn
remote: Resetting to the latest refs/remotes/git-svn
remote: Current branch master is up to date.
remote: * 66e2e6b (HEAD, git-svn, master) 5th git commit
remote: * b1d542e 4th git commit
remote: * d1b3d2e 3rd git commit
remote: | * e843c18 (origingit/master) 4th git commit
remote: | * 50fce36 3rd git commit
remote: * | 374031f 2nd git commit
remote: | * 0cf5d73 2nd git commit
remote: * | 935cb94 1st git commit
remote: | * 3f605fd 1st git commit
remote: |/
remote: * 4f10c9d 5th svn commit
remote: * 1c6e678 4th svn commit
remote: * 894eae9 3rd svn commit
remote: * 6739be3 2nd svn commit
remote: * 1d218b3 first svn commit
To ssh://localhost/tmp/myrepo_git_LS.git
e843c18..cda116d master -> master
+ echo mmm
+ git add folder/file.txt
+ git commit -m '6th git commit'
[master bd585c0] 6th git commit
1 file changed, 1 insertion(+)
+ sshpass -e git push origin master
remote: post-update kicking in
remote: From file:///tmp/myrepo_git_LS
remote: * branch master -> FETCH_HEAD
remote: First, rewinding head to replay your work on top of it...
remote: Applying: 5th git commit
remote: Using index info to reconstruct a base tree...
remote: Falling back to patching base and 3-way merge...
remote: Auto-merging folder/file.txt
remote: CONFLICT (content): Merge conflict in folder/file.txt
remote: Failed to merge in the changes.
remote: Patch failed at 0001 5th git commit
remote:
remote: When you have resolved this problem run "git rebase --continue".
remote: If you would prefer to skip this patch, instead run "git rebase --skip".
remote: To check out the original branch and stop rebasing run "git rebase --abort".
remote:
remote: * bd585c0 (HEAD) 6th git commit
remote: | * 66e2e6b (git-svn, master) 5th git commit
remote: | * b1d542e 4th git commit
remote: | * d1b3d2e 3rd git commit
remote: * | cda116d 5th git commit
remote: * | e843c18 (origingit/master) 4th git commit
remote: * | 50fce36 3rd git commit
remote: | * 374031f 2nd git commit
remote: * | 0cf5d73 2nd git commit
remote: | * 935cb94 1st git commit
remote: * | 3f605fd 1st git commit
remote: |/
remote: * 4f10c9d 5th svn commit
remote: * 1c6e678 4th svn commit
remote: * 894eae9 3rd svn commit
remote: * 6739be3 2nd svn commit
remote: * 1d218b3 first svn commit
remote: folder/file.txt: needs merge
remote: update-index --refresh: command returned error: 1
remote:
remote: folder/file.txt: needs merge
remote: update-index --refresh: command returned error: 1
remote:
remote: folder/file.txt: needs merge
remote: update-index --refresh: command returned error: 1
remote:
remote: * bd585c0 (HEAD) 6th git commit
remote: | * 66e2e6b (git-svn, master) 5th git commit
remote: | * b1d542e 4th git commit
remote: | * d1b3d2e 3rd git commit
remote: * | cda116d 5th git commit
remote: * | e843c18 (origingit/master) 4th git commit
remote: * | 50fce36 3rd git commit
remote: | * 374031f 2nd git commit
remote: * | 0cf5d73 2nd git commit
remote: | * 935cb94 1st git commit
remote: * | 3f605fd 1st git commit
remote: |/
remote: * 4f10c9d 5th svn commit
remote: * 1c6e678 4th svn commit
remote: * 894eae9 3rd svn commit
remote: * 6739be3 2nd svn commit
remote: * 1d218b3 first svn commit
To ssh://localhost/tmp/myrepo_git_LS.git
cda116d..bd585c0 master -> master
Raw
testrepo_nofail.log
+ rm -rf /tmp/myrepo_git_LS.git /tmp/myrepo_gitsvn /tmp/myrepo_git_wc /tmp/myrepo_svnco /tmp/myrepo_svn_WS
+ cd /tmp
+ echo 'simulating svn web server repo'
simulating svn web server repo
+ svnadmin create myrepo_svn_WS
+ read -s -p 'Enter ssh pass [note, you will be prompted again via GUI for the same]: ' SSHPASS
Enter ssh pass [note, you will be prompted again via GUI for the same]: + export SSHPASS
+ sshpass -e svn co svn+ssh://localhost/tmp/myrepo_svn_WS myrepo_svnco
svn: Caught signal
+ cd /tmp/myrepo_svnco
+ echo 'Adding first commits via svn'
Adding first commits via svn
+ echo aaa
+ svn add AA.txt
A AA.txt
+ sshpass -e svn ci -m 'first svn commit'
Adding AA.txt
Transmitting file data .
Committed revision 1.
+ echo bbb
+ svn add BB.txt
A BB.txt
+ sshpass -e svn ci -m '2nd svn commit'
Adding BB.txt
Transmitting file data .
Committed revision 2.
+ echo ccc
+ svn add CC.txt
A CC.txt
+ sshpass -e svn ci -m '3rd svn commit'
Adding CC.txt
Transmitting file data .
Committed revision 3.
+ echo ddd
+ svn add DD.txt
A DD.txt
+ sshpass -e svn ci -m '4th svn commit'
Adding DD.txt
Transmitting file data .
Committed revision 4.
+ echo eee
+ svn add EE.txt
A EE.txt
+ sshpass -e svn ci -m '5th svn commit'
Adding EE.txt
Transmitting file data .
Committed revision 5.
+ cd /tmp
+ echo 'Cloning svn as git'
Cloning svn as git
+ sshpass -e git svn clone svn+ssh://localhost/tmp/myrepo_svn_WS myrepo_gitsvn
Initialized empty Git repository in /tmp/myrepo_gitsvn/.git/
A AA.txt
r1 = 3fc052a8173158b3c038e0a19568cc1331b6245c (refs/remotes/git-svn)
A BB.txt
r2 = 40dd2d2d648f434d952b764b7f3d47d12b51b544 (refs/remotes/git-svn)
A CC.txt
r3 = 3e405da9b228a1720977ce3fccb199f3511520e5 (refs/remotes/git-svn)
A DD.txt
r4 = e87f6d33eb3454c71c4be61649dcf1791b8070fa (refs/remotes/git-svn)
A EE.txt
r5 = 9f31af6157abcbe727e6eb5ca9b77d9dd8a97429 (refs/remotes/git-svn)
Checked out HEAD:
svn+ssh://localhost/tmp/myrepo_svn_WS r5
+ echo 'Cloning a bare git local server'
Cloning a bare git local server
+ git clone --bare myrepo_gitsvn myrepo_git_LS.git
Cloning into bare repository 'myrepo_git_LS.git'...
done.
+ echo 'Adding a git local server remote to the gitsvn'
Adding a git local server remote to the gitsvn
+ cd /tmp/myrepo_gitsvn
+ git remote add origingit file:///tmp/myrepo_git_LS.git
+ cd /tmp
+ cat
+ chmod +x /tmp/myrepo_git_LS.git/hooks/post-update
+ cd /tmp
+ echo 'Cloning a git local server to git local working copy'
Cloning a git local server to git local working copy
+ sshpass -e git clone ssh://localhost/tmp/myrepo_git_LS.git myrepo_git_wc
Cloning into 'myrepo_git_wc'...
+ cd /tmp/myrepo_git_wc
+ echo 'Working from git local working copy now'
Working from git local working copy now
+ git config user.name me
+ git config user.email me@myself.com
+ mkdir folder
+ echo hhh
+ git add folder/file.txt
+ git commit -m '1st git commit'
[master bbe8da2] 1st git commit
1 file changed, 1 insertion(+)
create mode 100644 folder/file.txt
+ sshpass -e git push origin master
remote: post-update kicking in
remote: From file:///tmp/myrepo_git_LS
remote: * branch master -> FETCH_HEAD
remote: First, rewinding head to replay your work on top of it...
remote: Fast-forwarded master to bbe8da2bbcd8a670e572ab78f03ebc5b2854fe02.
remote: * bbe8da2 (HEAD, master) 1st git commit
remote: * 9f31af6 (git-svn) 5th svn commit
remote: * e87f6d3 4th svn commit
remote: * 3e405da 3rd svn commit
remote: * 40dd2d2 2nd svn commit
remote: * 3fc052a first svn commit
remote: Current branch master is up to date.
remote: Committing to svn+ssh://localhost/tmp/myrepo_svn_WS ...
remote: A folder/file.txt
remote: Committed r6
remote: A folder/file.txt
remote: r6 = adedf87675e9d17450d1f7cc9cf0804704e76315 (refs/remotes/git-svn)
remote: No changes between current HEAD and refs/remotes/git-svn
remote: Resetting to the latest refs/remotes/git-svn
remote: Current branch master is up to date.
remote: * adedf87 (HEAD, git-svn, master) 1st git commit
remote: * 9f31af6 5th svn commit
remote: * e87f6d3 4th svn commit
remote: * 3e405da 3rd svn commit
remote: * 40dd2d2 2nd svn commit
remote: * 3fc052a first svn commit
To ssh://localhost/tmp/myrepo_git_LS.git
9f31af6..bbe8da2 master -> master
+ echo iiii
+ git add folder/file.txt
+ git commit -m '2nd git commit'
[master bd35430] 2nd git commit
1 file changed, 1 insertion(+)
+ sshpass -e git push origin master
remote: post-update kicking in
remote: From file:///tmp/myrepo_git_LS
remote: * branch master -> FETCH_HEAD
remote: First, rewinding head to replay your work on top of it...
remote: * bd35430 (HEAD, master) 2nd git commit
remote: | * adedf87 (git-svn) 1st git commit
remote: * | bbe8da2 1st git commit
remote: |/
remote: * 9f31af6 5th svn commit
remote: * e87f6d3 4th svn commit
remote: * 3e405da 3rd svn commit
remote: * 40dd2d2 2nd svn commit
remote: * 3fc052a first svn commit
remote: First, rewinding head to replay your work on top of it...
remote: Applying: 2nd git commit
remote: Committing to svn+ssh://localhost/tmp/myrepo_svn_WS ...
remote: M folder/file.txt
remote: Committed r7
remote: M folder/file.txt
remote: r7 = 2c394b11d21f10cc57583ca4b46b9c0edb7af8f6 (refs/remotes/git-svn)
remote: No changes between current HEAD and refs/remotes/git-svn
remote: Resetting to the latest refs/remotes/git-svn
remote: Current branch master is up to date.
remote: * 2c394b1 (HEAD, git-svn, master) 2nd git commit
remote: * adedf87 1st git commit
remote: * 9f31af6 5th svn commit
remote: * e87f6d3 4th svn commit
remote: * 3e405da 3rd svn commit
remote: * 40dd2d2 2nd svn commit
remote: * 3fc052a first svn commit
To ssh://localhost/tmp/myrepo_git_LS.git
bbe8da2..bd35430 master -> master
+ echo 'Simulating svn server offline; git wc commits get added'
Simulating svn server offline; git wc commits get added
+ mv /tmp/myrepo_svn_WS /tmp/.myrepo_svn_WS
+ echo jjj
+ echo jjj
+ git add folder/file2.txt folder/file.txt
+ git commit -m '3rd git commit'
[master 31d5ea7] 3rd git commit
2 files changed, 2 insertions(+)
create mode 100644 folder/file2.txt
+ sshpass -e git push origin master
remote: post-update kicking in
remote: From file:///tmp/myrepo_git_LS
remote: * branch master -> FETCH_HEAD
remote: First, rewinding head to replay your work on top of it...
remote: * 31d5ea7 (HEAD, master) 3rd git commit
remote: | * 2c394b1 (git-svn) 2nd git commit
remote: * | bd35430 2nd git commit
remote: | * adedf87 1st git commit
remote: * | bbe8da2 1st git commit
remote: |/
remote: * 9f31af6 5th svn commit
remote: * e87f6d3 4th svn commit
remote: * 3e405da 3rd svn commit
remote: * 40dd2d2 2nd svn commit
remote: * 3fc052a first svn commit
remote: Couldn't find a repository: No repository found in 'svn+ssh://localhost/tmp/myrepo_svn_WS' at /usr/lib/git-core/git-svn line 2693
remote:
remote: Committing to svn+ssh://localhost/tmp/myrepo_svn_WS ...
remote: Couldn't find a repository: No repository found in 'svn+ssh://localhost/tmp/myrepo_svn_WS' at /usr/lib/git-core/git-svn line 920
remote:
remote: Couldn't find a repository: No repository found in 'svn+ssh://localhost/tmp/myrepo_svn_WS' at /usr/lib/git-core/git-svn line 2693
remote:
remote: * 31d5ea7 (HEAD, master) 3rd git commit
remote: | * 2c394b1 (git-svn) 2nd git commit
remote: * | bd35430 2nd git commit
remote: | * adedf87 1st git commit
remote: * | bbe8da2 1st git commit
remote: |/
remote: * 9f31af6 5th svn commit
remote: * e87f6d3 4th svn commit
remote: * 3e405da 3rd svn commit
remote: * 40dd2d2 2nd svn commit
remote: * 3fc052a first svn commit
To ssh://localhost/tmp/myrepo_git_LS.git
bd35430..31d5ea7 master -> master
+ echo kkkk
+ echo kkkk
+ git add folder/file2.txt folder/file.txt
+ git commit -m '4th git commit'
[master a6003cc] 4th git commit
2 files changed, 2 insertions(+)
+ sshpass -e git push origin master
remote: post-update kicking in
remote: From file:///tmp/myrepo_git_LS
remote: * branch master -> FETCH_HEAD
remote: First, rewinding head to replay your work on top of it...
remote: Fast-forwarded master to a6003cc07e3103f9ad613b2a72080b1fb19767b1.
remote: * a6003cc (HEAD, master) 4th git commit
remote: * 31d5ea7 3rd git commit
remote: | * 2c394b1 (git-svn) 2nd git commit
remote: * | bd35430 2nd git commit
remote: | * adedf87 1st git commit
remote: * | bbe8da2 1st git commit
remote: |/
remote: * 9f31af6 5th svn commit
remote: * e87f6d3 4th svn commit
remote: * 3e405da 3rd svn commit
remote: * 40dd2d2 2nd svn commit
remote: * 3fc052a first svn commit
remote: Couldn't find a repository: No repository found in 'svn+ssh://localhost/tmp/myrepo_svn_WS' at /usr/lib/git-core/git-svn line 2693
remote:
remote: Committing to svn+ssh://localhost/tmp/myrepo_svn_WS ...
remote: Couldn't find a repository: No repository found in 'svn+ssh://localhost/tmp/myrepo_svn_WS' at /usr/lib/git-core/git-svn line 920
remote:
remote: Couldn't find a repository: No repository found in 'svn+ssh://localhost/tmp/myrepo_svn_WS' at /usr/lib/git-core/git-svn line 2693
remote:
remote: * a6003cc (HEAD, master) 4th git commit
remote: * 31d5ea7 3rd git commit
remote: | * 2c394b1 (git-svn) 2nd git commit
remote: * | bd35430 2nd git commit
remote: | * adedf87 1st git commit
remote: * | bbe8da2 1st git commit
remote: |/
remote: * 9f31af6 5th svn commit
remote: * e87f6d3 4th svn commit
remote: * 3e405da 3rd svn commit
remote: * 40dd2d2 2nd svn commit
remote: * 3fc052a first svn commit
To ssh://localhost/tmp/myrepo_git_LS.git
31d5ea7..a6003cc master -> master
+ echo 'Simulating svn server back online; git wc commits get added'
Simulating svn server back online; git wc commits get added
+ mv /tmp/.myrepo_svn_WS /tmp/myrepo_svn_WS
+ echo lll
+ git add folder/file.txt
+ git commit -m '5th git commit'
[master 3888cfb] 5th git commit
1 file changed, 1 insertion(+)
+ sshpass -e git push origin master
remote: post-update kicking in
remote: From file:///tmp/myrepo_git_LS
remote: * branch master -> FETCH_HEAD
remote: First, rewinding head to replay your work on top of it...
remote: Fast-forwarded master to 3888cfb0a43f77e985987b3196b09cbb0984e297.
remote: * 3888cfb (HEAD, master) 5th git commit
remote: * a6003cc 4th git commit
remote: * 31d5ea7 3rd git commit
remote: | * 2c394b1 (git-svn) 2nd git commit
remote: * | bd35430 2nd git commit
remote: | * adedf87 1st git commit
remote: * | bbe8da2 1st git commit
remote: |/
remote: * 9f31af6 5th svn commit
remote: * e87f6d3 4th svn commit
remote: * 3e405da 3rd svn commit
remote: * 40dd2d2 2nd svn commit
remote: * 3fc052a first svn commit
remote: First, rewinding head to replay your work on top of it...
remote: Applying: 3rd git commit
remote: Applying: 4th git commit
remote: Applying: 5th git commit
remote: Committing to svn+ssh://localhost/tmp/myrepo_svn_WS ...
remote: M folder/file.txt
remote: A folder/file2.txt
remote: Committed r8
remote: A folder/file2.txt
remote: M folder/file.txt
remote: r8 = 332abfb08b34bd11c776b1d6daef32b7e7ded722 (refs/remotes/git-svn)
remote: No changes between current HEAD and refs/remotes/git-svn
remote: Resetting to the latest refs/remotes/git-svn
remote: Unstaged changes after reset:
remote: M folder/file.txt
remote: M folder/file2.txt
remote: M folder/file.txt
remote: M folder/file2.txt
remote: Committed r9
remote: M folder/file2.txt
remote: M folder/file.txt
remote: r9 = f60c9bd23dc328d466568d03ca27ee7fc043d106 (refs/remotes/git-svn)
remote: No changes between current HEAD and refs/remotes/git-svn
remote: Resetting to the latest refs/remotes/git-svn
remote: Unstaged changes after reset:
remote: M folder/file.txt
remote: M folder/file.txt
remote: Committed r10
remote: M folder/file.txt
remote: r10 = ff66d4e4fc64dd402acdf2765026dbc4c9021c45 (refs/remotes/git-svn)
remote: No changes between current HEAD and refs/remotes/git-svn
remote: Resetting to the latest refs/remotes/git-svn
remote: Current branch master is up to date.
remote: * ff66d4e (HEAD, git-svn, master) 5th git commit
remote: * f60c9bd 4th git commit
remote: * 332abfb 3rd git commit
remote: * 2c394b1 2nd git commit
remote: * adedf87 1st git commit
remote: * 9f31af6 5th svn commit
remote: * e87f6d3 4th svn commit
remote: * 3e405da 3rd svn commit
remote: * 40dd2d2 2nd svn commit
remote: * 3fc052a first svn commit
To ssh://localhost/tmp/myrepo_git_LS.git
a6003cc..3888cfb master -> master
+ echo mmm
+ git add folder/file.txt
+ git commit -m '6th git commit'
[master 38f6018] 6th git commit
1 file changed, 1 insertion(+)
+ sshpass -e git push origin master
remote: post-update kicking in
remote: From file:///tmp/myrepo_git_LS
remote: * branch master -> FETCH_HEAD
remote: First, rewinding head to replay your work on top of it...
remote: * 38f6018 (HEAD, master) 6th git commit
remote: | * ff66d4e (git-svn) 5th git commit
remote: | * f60c9bd 4th git commit
remote: | * 332abfb 3rd git commit
remote: * | 3888cfb 5th git commit
remote: * | a6003cc 4th git commit
remote: * | 31d5ea7 3rd git commit
remote: | * 2c394b1 2nd git commit
remote: * | bd35430 2nd git commit
remote: | * adedf87 1st git commit
remote: * | bbe8da2 1st git commit
remote: |/
remote: * 9f31af6 5th svn commit
remote: * e87f6d3 4th svn commit
remote: * 3e405da 3rd svn commit
remote: * 40dd2d2 2nd svn commit
remote: * 3fc052a first svn commit
remote: First, rewinding head to replay your work on top of it...
remote: Applying: 6th git commit
remote: Committing to svn+ssh://localhost/tmp/myrepo_svn_WS ...
remote: M folder/file.txt
remote: Committed r11
remote: M folder/file.txt
remote: r11 = c82ea1ecec63fa0c127bdcca476b9f42bd2d7c01 (refs/remotes/git-svn)
remote: No changes between current HEAD and refs/remotes/git-svn
remote: Resetting to the latest refs/remotes/git-svn
remote: Current branch master is up to date.
remote: * c82ea1e (HEAD, git-svn, master) 6th git commit
remote: * ff66d4e 5th git commit
remote: * f60c9bd 4th git commit
remote: * 332abfb 3rd git commit
remote: * 2c394b1 2nd git commit
remote: * adedf87 1st git commit
remote: * 9f31af6 5th svn commit
remote: * e87f6d3 4th svn commit
remote: * 3e405da 3rd svn commit
remote: * 40dd2d2 2nd svn commit
remote: * 3fc052a first svn commit
To ssh://localhost/tmp/myrepo_git_LS.git
3888cfb..38f6018 master -> master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment