"svn diff" says the merge definitely removed the svn:mergeinfo property from
the files. For some reason the files I was checking never had svn:keywords
so maybe someone with a bad setup initially committed the files.
When I remove these svn:merginfo properties, I should leave the one on the
project root intact right (i.e. the one with an actual branch name and rev #
in there)?
Is there a command for recursively removing svn:mergeinfo for everything
below (but not including) the current directory?
Thanks,
Bradley
On Thu, Jul 2, 2009 at 2:04 PM, Mark Phippard <markphip_at_gmail.com> wrote:
> On Thu, Jul 2, 2009 at 1:58 PM, Bradley
> Wagner<bradley.wagner_at_hannonhill.com> wrote:
> > Not sure I understand the outgoing changes. The diff is showing the first
> > line as having changed but no changes exist.
>
> Did you use svn diff? It would show property add/removes.
>
> > When I do a Team > Show Properties it says "Some properties have been
> > modified since your last commit" but doesn't show any of the SVN
> properties.
> > Is this saying that the merge has actually removed properties from the
> > files? Also, all of our Java files have svn:keywords but these seem to
> have
> > disappeared after the merge as well.
>
> It would not have removed svn:keywords, but it is possible it removed
> svn:mergeinfo.
>
> > This is a result of renaming files in versions prior to SVN 1.5.6? I
> thought
> > svn:mergeinfo wasn't even introduced until 1.5.x and we have been svn
> 1.3.2
> > the whole time. Is this a function of newer clients performing
> > copies/renames?
>
> Yes, if you are using say a 1.5.1 client when you do the copy/move.
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> ------------------------------------------------------
>
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2367536
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_subclipse.tigris.org].
>
--
Hannon Hill - CMS Experience You Can Trust
(678) 904-6900 ext 115
http://www.hannonhill.com
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2367537
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-07-02 20:11:43 CEST