[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

prop conflict editing and newlines

From: David Glasser <glasser_at_davidglasser.net>
Date: 2007-11-23 19:00:35 CET

Hmm, so I got a prop conflict on 1.4.x and selected (e)dit and got this:

<<<<<<< (modified)
/trunk:1-19523,19527-19533,19535-19539,19541,19543-19544,19546-19552,19555-19556,19558-19565,19572,19577,19580-19582,19584-19587,19591-19594,19597,19599,19601-19606,19608-19609,19611-19612,19615,19620-19628,19630-19633,19636-19639,19642-19646,19649,19651-19654,19656-19667,19669-19691,19694,19696,19698-19700,19702-19707,19709-19710,19713,19717,19719,19729-19732,19735-19738,19745-19780,19782,19785-19788,19790,19792-19793,19795-19796,19800,19802-19805,19807,19811-19831,19833-19835,19837,19841-19843,19852,19858,19861-19863,19866-19874,19876-19887,19890,19892-19899,19903-19907,19909-19912,19914-19920,19924-19925,19934-19943,19945,19947-19952,19954-19956,19959,19963-19970,19972,19974-19982,19985,19987-19990,19992-19996,20000-20003,20007-20012,20017-20019,20023,20025,20027-20033,20036-20055,20057-20059,20063-20071,20074,20076-20081,20083-20084,20089-20093,20096-20097,20099,20101,20104-20106,20108,20111-20112,20114-20121,20123-20130,20132-20142,20149-20151,20153-20154,20165-20166,20169-20172,20175,20177-20189,20191,
20193-20207,20209-20211,20214-20218,20223,20225,20234,20239,20248,20251-20256,20261,20264,20266,20269-20270,20272-20276,20280,20283,20285,20287-20290,20298,20301-20302,20305-20306,20308,20312-20314,20318-20319,20322-20327,20330,20339-20342,20344,20346,20350-20351,20353-20354,20357-20369,20371-20375,20381-20382,20386,20388,20391,20395-20400,20402-20408,20410-20413,20423-20426,20428-20429,20431-20432,20434-20441,20443,20458,20461-20465,20469-20473,20476-20477,20484-20485,20490-20495,20497,20499-20531,20533-20535,20537-20556,20558-20562,20564-20570,20572-20582,20584-20591,20593-20594,20596-20601,20605-20606,20608-20618,20620-20636,20638-20640,20643,20648,20650-20659,20666-20667,20687,20689,20692,20701-20704,20708-20730,20734-20739,20741-20749,20751-20754,20758,20761-20767,20769-20782,20784-20790,20797,20799-20800,20803-20804,20806,20808-20810,20812-20815,20817-20818,20825,20827-20836,20838-20843,20846-20847,20849-20850,20852-20856,20858,20861-20862,20864-20867,20869,20871,20873-20880,20882-20883,20885-20887,208
90,20893,20896,20911,20916-20924,20926-20928,20930-20931,20933-20941,20943-20944,20950,20953-20968,20971,20973-20981,20983-20984,20992,20996-20997,20999-21000,21002,21004-21011,21017-21018,21021-21023,21025-21026,21028-21035,21037,21039-21044,21046-21047,21049-21055,21063-21064,21066-21067,21072-21073,21075-21076,21078-21079,21082-21085,21089-21093,21095-21100,21108,21114-21127,21133-21137,21141-21151,21155,21159-21160,21162-21165,21167-21172,21174,21176-21179,21181,21183-21184,21189-21200,21202-21205,21207-21209,21211-21213,21215-21228,21234-21235,21237,21249-21251,21253-21258,21264,21272,21282,21286-21287,21289-21298,21300-21301,21307,21314-21317,21320-21323,21325,21333-21344,21346,21349,21355-21357,21359-21362,21367-21368,21374,21378,21380,21384-21385,21387-21388,21392-21396,21403,21411-21414,21421,21424-21426,21428-21433,21439,21447,21449,21452-21456,21459,21470-21476,21482-21486,21489-21491,21497,21499,21504,21506-21507,21509-21511,21513,21515-21516,21523,21525-21528,21532,21537,21543,21552-21553,21556,
21562-21563,21566-21567,21571-21572,21575-21579,21581-21583,21585-21589,21592-21595,21601-21602,21605,21609-21613,21617-21618,21629-21630,21636,21638,21640-21642,21644,21646-21647,21649,21651,21657-21658,21662-21665,21669-21670,21673-21675,21677-21678,21680-21681,21685-21690,21694,21696-21698,21703-21712,21717,21720-21721,21724,21726-21727,21738,21742,21745,21751,21753-21754,21758,21760,21762-21767,21769-21771,21778,21780-21781,21783,21788-21789,21792-21796,21798-21799,21802-21817,21822-21825,21827-21840,21842-21844,21846,21849,21851-21853,21856,21860,21862-21864,21866-21874,21877-21878,21880-21883,21886,21890-21898,21901,21903-21904,21906-21907,21909-21912,21915,21917-21920,21922-21928,21930-21933,21935-21947,21949-21968,21973-21978,21983-21988,21991-21992,21994,22002-22005,22007-22008,22010,22023,22026,22030,22033-22036,22046,22048-22049,22051-22053,22055-22066,22068,22071-22072,22077-22082,22084-22087,22092-22094,22096,22100,22102,22104-22105,22109,22111,22113-22124,22126-22127,22130-22135,22139-22144,221
48,22155,22159,22163-22165,22167-22168,22170-22178,22182-22189,22192-22199,22201-22205,22207-22212,22214,22224-22225,22227,22234,22253-22256,22260,22263-22268,22272-22276,22281-22286,22291-22292,22297-22300,22302-22303,22307-22309,22311-22312,22315,22321-22322,22329-22330,22332,22336,22339,22346,22350-22352,22357-22365,22369,22376,22378,22382,22387,22390-22391,22393-22394,22396,22404,22406,22412-22423,22425-22427,22431-22433,22440-22441,22443,22445-22446,22450,22453-22454,22459-22463,22465-22467,22470,22472-22478,22482,22485-22488,22493,22495-22496,22498,22500-22502,22507-22509,22511,22517,22526,22528,22536-22541,22546-22547,22549-22550,22555,22557,22559-22561,22563-22567,22569-22573,22579,22584-22585,22592-22593,22595-22600,22602,22604-22605,22608-22609,22612,22616-22620,22626-22628,22630,22633-22643,22646-22647,22649,22652-22653,22656,22658-22659,22662-22668,22670-22673,22681-22686,22688-22700,22702,22704-22706,22709-22711,22713,22716-22717,22723,22729-22732,22737,22739-22741,22745,22751,22753,22755-22759,
22763,22768,22777,22780-22782,22784,22802,22806,22808-22809,22814,22817,22824-22825,22829-22831,22834,22850-22852,22859-22878,22885,22890,22892-22893,22895,22899-22905,22908,22910-22912,22914,22917,22931,22935,22939,22941-22944,22951,22953,22968-22970,22975-22976,22984,22991-22993,22996-23005,23007,23009-23011,23013-23014,23016,23018-23022,23026,23028,23034-23036,23038,23040,23042-23043,23046,23049-23050,23054,23056-23060,23076-23078,23082-23083,23093-23094,23096,23098-23099,23105-23108,23110-23115,23117-23118,23124-23126,23140-23144,23150,23153-23154,23156-23158,23160,23162-23164,23166-23168,23171-23172,23174,23177-23179,23182,23184,23187-23188,23191,23193-23196,23198-23201,23203,23207-23208,23211,23213,23217,23221,23223,23225-23227,23231-23232,23242-23248,23258-23262,23276,23283-23285,23290,23298,23308,23317,23320,23332-23339,23354-23355,23360,23362,23367-23368,23371-23372,23375,23383,23386,23388-23389,23397,23399,23402,23404-23408,23411-23412,23419,23422-23424,23435-23436,23439-23440,23444-23445,23447-234
51,23453,23458,23465,23468,23491-23492,23494,23514,23516,23519,23521,23556,23594,23815,23846,23910,23942,23959,23978,24073,24126,24128,24134-24136,24144-24151,24153-24154,24156-24158,24162-24167,24179-24180,24187-24188,24192-24194,24197,24219-24220,24223-24224,24233-24235,24246,24250-24253,24371,24381-24382,24386,24389-24391,24483,24697,24699,24702-24704,24710-24711,24755-24758,24760-24763,24766-24768,24772-24778,24786,24788,24793-24794,24822-24824,24827,25063,25076-25078,25080,25187,25208,25395,25586-25587,25593,25607,25613,25616,25640-25641,25654,26018,26047,26115,26156,26264,26964-26966,26968,27056,27256,27263=======
/trunk:1-19523,19527-19533,19535-19539,19541,19543-19544,19546-19552,19555-19556,19558-19565,19572,19577,19580-19582,19584-19587,19591-19594,19597,19599,19601-19606,19608-19609,19611-19612,19615,19620-19628,19630-19633,19636-19639,19642-19646,19649,19651-19654,19656-19667,19669-19691,19694,19696,19698-19700,19702-19707,19709-19710,19713,19717,19719,19729-19732,19735-19738,19745-19780,19782,19785-19788,19790,19792-19793,19795-19796,19800,19802-19805,19807,19811-19831,19833-19835,19837,19841-19843,19852,19858,19861-19863,19866-19874,19876-19887,19890,19892-19899,19903-19907,19909-19912,19914-19920,19924-19925,19934-19943,19945,19947-19952,19954-19956,19959,19963-19970,19972,19974-19982,19985,19987-19990,19992-19996,20000-20003,20007-20012,20017-20019,20023,20025,20027-20033,20036-20055,20057-20059,20063-20071,20074,20076-20081,20083-20084,20089-20093,20096-20097,20099,20101,20104-20106,20108,20111-20112,20114-20121,20123-20130,20132-20142,20149-20151,20153-20154,20165-20166,20169-20172,20175,20177-20189,20191,
20193-20207,20209-20211,20214-20218,20223,20225,20234,20239,20248,20251-20256,20261,20264,20266,20269-20270,20272-20276,20280,20283,20285,20287-20290,20298,20301-20302,20305-20306,20308,20312-20314,20318-20319,20322-20327,20330,20339-20342,20344,20346,20350-20351,20353-20354,20357-20369,20371-20375,20381-20382,20386,20388,20391,20395-20400,20402-20408,20410-20413,20423-20426,20428-20429,20431-20432,20434-20441,20443,20458,20461-20465,20469-20473,20476-20477,20484-20485,20490-20495,20497,20499-20531,20533-20535,20537-20556,20558-20562,20564-20570,20572-20582,20584-20591,20593-20594,20596-20601,20605-20606,20608-20618,20620-20636,20638-20640,20643,20648,20650-20659,20666-20667,20687,20689,20692,20701-20704,20708-20730,20734-20739,20741-20749,20751-20754,20758,20761-20767,20769-20782,20784-20790,20797,20799-20800,20803-20804,20806,20808-20810,20812-20815,20817-20818,20825,20827-20836,20838-20843,20846-20847,20849-20850,20852-20856,20858,20861-20862,20864-20867,20869,20871,20873-20880,20882-20883,20885-20887,208
90,20893,20896,20911,20916-20924,20926-20928,20930-20931,20933-20941,20943-20944,20950,20953-20968,20971,20973-20981,20983-20984,20992,20996-20997,20999-21000,21002,21004-21011,21017-21018,21021-21023,21025-21026,21028-21035,21037,21039-21044,21046-21047,21049-21055,21063-21064,21066-21067,21072-21073,21075-21076,21078-21079,21082-21085,21089-21093,21095-21100,21108,21114-21127,21133-21137,21141-21151,21155,21159-21160,21162-21165,21167-21172,21174,21176-21179,21181,21183-21184,21189-21200,21202-21205,21207-21209,21211-21213,21215-21228,21234-21235,21237,21249-21251,21253-21258,21264,21272,21282,21286-21287,21289-21298,21300-21301,21307,21314-21317,21320-21323,21325,21333-21344,21346,21349,21355-21357,21359-21362,21367-21368,21374,21378,21380,21384-21385,21387-21388,21392-21396,21403,21406-21407,21411-21414,21421,21424-21426,21428-21433,21439,21447,21449,21452-21456,21459,21470-21476,21482-21486,21489-21491,21497,21499,21504,21506-21507,21509-21511,21513,21515-21516,21523,21525-21528,21532,21537,21540,21543,
21552-21553,21556,21562-21563,21566-21567,21571-21572,21575-21579,21581-21583,21585-21589,21592-21595,21601-21602,21605,21609-21613,21617-21618,21629-21630,21636,21638,21640-21642,21644,21646-21647,21649,21651,21657-21658,21662-21665,21669-21670,21673-21675,21677-21678,21680-21681,21685-21690,21694,21696-21698,21703-21712,21717,21720-21721,21724,21726-21727,21738,21742,21745,21751,21753-21754,21758,21760,21762-21767,21769-21771,21778,21780-21781,21783,21788-21789,21792-21796,21798-21799,21802-21817,21822-21825,21827-21840,21842-21844,21846,21849,21851-21853,21856,21860,21862-21864,21866-21874,21877-21878,21880-21883,21886,21890-21898,21901,21903-21904,21906-21907,21909-21912,21915,21917-21920,21922-21928,21930-21933,21935-21947,21949-21968,21973-21978,21983-21988,21991-21992,21994,22002-22005,22007-22008,22010,22023,22026,22030,22033-22036,22046,22048-22049,22051-22053,22055-22066,22068,22071-22072,22077-22082,22084-22087,22092-22094,22096,22100,22102,22104-22105,22109,22111,22113-22124,22126-22127,22130-221
35,22139-22144,22148,22155,22159,22163-22165,22167-22168,22170-22178,22182-22189,22192-22199,22201-22205,22207-22212,22214,22224-22225,22227,22234,22253-22256,22260,22263-22268,22272-22276,22281-22286,22291-22292,22297-22300,22302-22303,22307-22309,22311-22312,22315,22321-22322,22329-22330,22332,22336,22339,22346,22350-22352,22357-22365,22369,22376,22378,22382,22387,22390-22391,22393-22394,22396,22404,22406,22412-22423,22425-22427,22431-22433,22440-22441,22443,22445-22446,22450,22453-22454,22459-22463,22465-22467,22470,22472-22478,22482,22485-22488,22493,22495-22496,22498,22500-22502,22507-22509,22511,22517,22526,22528,22536-22541,22546-22547,22549-22550,22555,22557,22559-22561,22563-22567,22569-22573,22579,22584-22585,22592-22593,22595-22600,22602,22604-22605,22608-22609,22612,22616-22620,22626-22628,22630,22633-22643,22646-22647,22649,22652-22653,22656,22658-22659,22662-22668,22670-22673,22681-22686,22688-22700,22702,22704-22706,22709-22711,22713,22716-22717,22723,22729-22732,22737,22739-22741,22745,22751,
22753,22755-22759,22763,22768,22777,22780-22782,22784,22802,22806,22808-22809,22814,22817,22824-22825,22829-22831,22834,22850-22852,22859-22878,22885,22890,22892-22893,22895,22899-22905,22908,22910-22912,22914,22917,22931,22935,22939,22941-22944,22951,22953,22968-22970,22975-22976,22984,22991-22993,22996-23005,23007,23009-23011,23013-23014,23016,23018-23022,23026,23028,23034-23036,23038,23040,23042-23043,23046,23049-23050,23054,23056-23060,23076-23078,23082-23083,23093-23094,23096,23098-23099,23105-23108,23110-23115,23117-23118,23124-23126,23140-23144,23150,23153-23154,23156-23158,23160,23162-23164,23166-23168,23171-23172,23174,23177-23179,23182,23184,23187-23188,23191,23193-23196,23198-23201,23203,23207-23208,23211,23213,23217,23221,23223,23225-23227,23231-23232,23242-23248,23258-23262,23276,23283-23285,23290,23298,23308,23317,23320,23332-23339,23354-23355,23360,23362,23367-23368,23371-23372,23375,23383,23386,23388-23389,23397,23399,23402,23404-23408,23411-23412,23419,23422-23424,23435-23436,23439-23440,234
44-23445,23447-23451,23453,23458,23465,23468,23491-23492,23494,23514,23516,23519,23521,23556,23594,23846,23910,23942,23959,23978,24073,24126,24128,24134-24136,24144-24151,24153-24154,24156-24158,24162-24167,24179-24180,24187-24188,24192-24194,24197,24219-24220,24223-24224,24233-24235,24246,24250-24253,24371,24381-24382,24386,24389-24391,24483,24710-24711,24755,24786,25063,25187,25208,25395,25586-25587,25593,25607,25613,25616,25640-25641,25654,26047,26156>>>>>>>
(latest)

Shouldn't there be newlines before the middle and end conflict markers?

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 23 19:00:49 2007

This is an archived mail posted to the Subversion Dev mailing list.