Gisle Vanem wrote:
> What does the lines like "<<< .mine" do in this file?
They indicate that somebody had a modified version of the file, and that
somebody else checked into SVN changes to that file that conflicted with
the first person's changes in ways that SVN couldn't resolve, so it's
indicating that:
<<<<<<< .mine
dissect_q932_PresentedNumberScreened
dissect_q932_PresentedNumberUnscreened
dissect_q932_PartyNumber
dissect_q932_PartySubaddress
=======
dissect_q932_PartyNumber
dissect_q932_PartySubaddress
dissect_q932_PresentedNumberUnscreened
dissect_q932_PresentedNumberScreened
>>>>>>> .r23226
the first user's modified version of the file had the lines between
"<<<<<<< .mine" and "=======" and the checked-in modifications had the
lines between "=======" and ">>>>>>> .r23226" (which were from SVN
version 23226).
If the first somebody was you, then "svn update" (or its GUI equivalent)
should have reported the conflict. The "<<<<<<< .mine" lines aren't in
the current version in SVN, so I suspect it's reporting a conflict
between changes you made and changes somebody checked in. "svn status"
should report the files that have conflicts.
> Besides eth_stdio_fopen() shall not be exported from libwireshark.dll.
> A patch:
>
> --- SVN-Latest\epan\libwireshark.def Wed Oct 31 17:03:44 2007
> +++ epan\libwireshark.def Wed Oct 31 17:31:01 2007
> @@ -221,17 +221,10 @@
> dissect_per_sequence
> dissect_per_set_of
> dissect_per_VisibleString
> -<<<<<<< .mine
> dissect_q932_PresentedNumberScreened
> dissect_q932_PresentedNumberUnscreened
> dissect_q932_PartyNumber
> dissect_q932_PartySubaddress
> -=======
> -dissect_q932_PartyNumber
> -dissect_q932_PartySubaddress
> -dissect_q932_PresentedNumberUnscreened
> -dissect_q932_PresentedNumberScreened
> ->>>>>>> .r23226
That looks like a sort-order conflict - the lines are the same, they're
just not in alphabetical order in the .mine version, but are in the
.r23226 version.
> @@ -696,16 +688,11 @@
> proto_tree_get_parent
> proto_tree_get_root
> proto_tree_move_item
> -<<<<<<< .mine
> +protocols_module DATA
> p_add_proto_data
> p_get_proto_data
> q931_cause_code_vals DATA
> q850_cause_code_vals DATA
> -=======
> -protocols_module DATA
> -q850_cause_code_vals DATA
> -q931_cause_code_vals DATA
> ->>>>>>> .r23226
> q931_message_type_vals DATA
> range_convert_range
> range_convert_str
That looks like your version had p_add_proto_data and p_get_proto_data
added after protocols_module; they're in the current version already,
after other_decode_bitfield_value.
_______________________________________________
Wireshark-dev mailing list
[email protected]
http://www.wireshark.org/mailman/listinfo/wireshark-dev
