Andy Levy wrote:
> svn diff will tell you what properties have changed and the values.
OK, how do I edit it to kill the merge-info
I tried,
svn propedit svn:mergeinfo FilterListBase.java
which brings up the properties in VI, but deleting them does not clear
them out.
svn diff FilterListBase.java
Property changes on: FilterListBase.java
___________________________________________________________________
Modified: svn:mergeinfo
Reverse-merged
/bbook/branches/scott/fnfapp/src/java/com/fnfbook/bean/FilterListBase.java:r5623-5669,5671-5679,5801-5869,6105-6201,6932-6942,7190-7279,7387-7407,7491-7523,7683-7703
Reverse-merged
/bbook/trunk/trunk/fnfapp/src/java/com/fnfbook/bean/FilterListBase.java:r4195-4223,5590,5823-5824
Reverse-merged
/bbook/branches/pat/fnfapp/src/java/com/fnfbook/bean/FilterListBase.java:r5530-5544,5548-5559,5562-5588,5591-5604,5607-5616,5620-5666,5672-5679,5683-5756,5774-5776,5780-5782,5795-5813,5816-5822,5825-5829,5833-5874,5877-5924,5927-5933,5936-5983,5993-6026,6040-6055,6058-6107,6111-6136,6140-6160,6172-6175,6178-6186,6195-6218,6226-6233,6236-6252,6257-6288,6291-6303,6307-6347,6352-6365,6370-6373,6376-6382,6385-6408,6411-6430,6433-6436,6441-6453,6457-6470,6474-6486,6489-6494,6498-6504,6507-6517,6520-6558,6560-6570,6573-6576,6583-6587,6590-6596,6599-6616,6619-6632,6635-6649,6652-6664,6667-6697,6700-6730,6733-6748,6751-6778,6782-6854,6858-6911,6914-6931,6939-6953,6956-6964,6967-7044,7047-7111,7114-7119,7122-7135,7138-7145,7149-7151,7156-7186,7193-7194,7197-7218,7222-7224,7227-7294,7300-7407,7411-7422,7425-7453,7456-7474,7477-7517,7526-7538,7543-7581,7584-7608,7612-7642,7645-7650,7653-7662,7665-7689,7716-7740
Reverse-merged
/bbook/branches/pat/trunk/fnfapp/src/java/com/fnfbook/bean/FilterListBase.java:r4196-4221,5591-5604
I want to do something, nearly anything, to make the sandbox's copy
match the repository and stop telling me that changes have been made.
Perhaps I need to do the propedit on the branch, not the trunk?
--
Pat Farrell
http://www.pfarrell.com/
Received on 2010-02-11 22:29:22 CET