what does _M mean from svn status?

[Pat Farrell]

Fairly often, when I do a merge from my branch to the trunk, a handful
of files are show with a
_M indication
(that is underscore in column 1 and an M in column 2)

What does this mean?
How do I clear it out?

Even blowing away the sandbox and checking out the whole tree does not
seem to clear it.

Thanks
Pat

[Andy Levy]

M in the second column indicates that the item's properties have changed.

Having trouble finding any documentation on the underscore. Seems like
a very odd symbol to use here.

What version of Subversion are you using?

[Pat Farrell]

Andy Levy wrote:
> M in the second column indicates that the item's properties have changed.

How do I find out what property has changed?

> Having trouble finding any documentation on the underscore. Seems like
> a very odd symbol to use here.

Its not documented in the RedBean.

> What version of Subversion are you using?

svn, version 1.6.5 (r38866)
compiled Aug 31 2009, 18:42:02

Copyright (C) 2000-2009 CollabNet.

--
Pat Farrell
http://www.pfarrell.com/

[Andy Levy]

On Thu, Feb 11, 2010 at 13:04, Pat Farrell <pfar...@pfarrell.com> wrote:
> Andy Levy wrote:
>> M in the second column indicates that the item's properties have changed.
>
> How do I find out what property has changed?

svn diff will tell you what properties have changed and the values.

[Pat Farrell]

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?

[Daniel Shahaf]

Pat Farrell wrote on Thu, 11 Feb 2010 at 13:04 -0500:

> Andy Levy wrote:
> > Having trouble finding any documentation on the underscore. Seems like
> > a very odd symbol to use here.
>
> Its not documented in the RedBean.

Source inspection [1] reveals that '_' is used in the listing of files in
a log message (i.e., the thing below the "--This line, and those below,
will be ignored--" line in an 'svn commit' lacking -m and -F) when the
file is neither textually modified nor added, removed, or replaced.

Is that what you were seeing? (the subject says 'svn status', but I
can't find an "'_'" in the 'svn st' code in trunk)

Daniel

[1] grep "'_'" subversion/svn/*.c

[Pat Farrell]

Daniel Shahaf wrote:
> Source inspection [1] reveals that '_' is used in the listing of files in
> a log message (i.e., the thing below the "--This line, and those below,
> will be ignored--" line in an 'svn commit' lacking -m and -F) when the
> file is neither textually modified nor added, removed, or replaced.
>
> Is that what you were seeing? (the subject says 'svn status', but I
> can't find an "'_'" in the 'svn st' code in trunk)

I am not sure, I do know I see it in the commit window, below the --
comment.

Sorry for not having a perfectly reproducible problem, but that is
partially why its bugging me.

svn diff shows
Modified: svn:mergeinfo

with stuff.

Would be nice to clean this up.
Thanks
Pat

[Pat Farrell]

Daniel Shahaf wrote:
> Is that what you were seeing? (the subject says 'svn status', but I
> can't find an "'_'" in the 'svn st' code in trunk)

On further testing, the _ is only in the commit entries, but svn status
will show the " M"

No luck so far in clearing out the merge-info

[Ryan Schmidt]

On Feb 11, 2010, at 15:28, Pat Farrell wrote:

> OK, how do I edit it to kill the merge-info

I'm not clear on why you're trying to defeat the merge tracking feature?

[Pat Farrell]

Ryan Schmidt wrote:
> Pat Farrell wrote:
>> OK, how do I edit it to kill the merge-info
>
> I'm not clear on why you're trying to defeat the merge tracking feature?

Because:

1) I have never seen it work
2) this is the trunk, and I don't want false messages when I commit that
something has changed when it has not.

At best, the RedBean documentation on merge-tracking is vague and
misleading. It needs to be updated to something reflecting the state of
current svn releases.