>
> This is normal SVN merge behavior. Looks like you are going to have
fun when you upgrade :)
> You probably have a ton of files that have acquired the svn:mergeinfo
property. Probably empty. Probably created by copying/renaming
files. SVN 1.5.6 made changes to stop doing this. You should
systematically remove all occurrences of that property in your
repository ASAP, and make sure no one is using earlier 1.5.x clients.
Do you have any suggestions on how to do this across an entire repository? I
just did this for my working copy trunk using "svn -R propdel svn:mergeinfo"
but I figured there is a probably away to do it to the entire repository in
one swoop.
I looked at doing it by passing the repos url to the propdel command but
this apparently is an unversioned property change? I'm not familiar with
this concept, but I do know that I'd like to be able to see in our version
history that I deleted all these properties.
Thanks again,
Bradley
On Thu, Jul 2, 2009 at 1:41 PM, Mark Phippard <markphip_at_gmail.com> wrote:
> On Thu, Jul 2, 2009 at 1:36 PM, Bradley
> Wagner<bradley.wagner_at_hannonhill.com> wrote:
> > The author dropdown is empty and inactive meaning I cannot select it.
> >
> > I'm wondering if it has to do with the combination of having a client
> that
> > does support it (1.6) and a server that doesn't (1.3.2). Although, you
> said
> > your project was using 1.3.x on the server side while the client was
> under
> > development.
>
> Yes, it should work. All my servers are now on 1.5+ though so harder
> to test. But tigris was on 1.3 until December and openCollabNet was
> on 1.4 until March. And this all worked fine. Of course that was
> with earlier versions, so maybe something has broken.
>
> > I switched over to our svn 1.6 test server and it of course works much
> > better. However, I ran into another strange thing when attempting to
> merge a
> > single revision from my trunk into a release branch. Basically, the Merge
> > Result showed a single file updated, the summary at the end showed a
> single
> > file updated, but when I synchronized my branch there tons of outgoing
> > changes as if it had merged many revisions. The SVN console seems to only
> > indicate one:
> >
> > merge -c 12605 http://bradley.wagner@dev.company.com/repos/project/trunk
> > /Users/bradley/Java/workspace/project_stable_test
> > --- Merging r12604 through r12605 into
> > /Users/bradley/Java/workspace/project_stable_test
> > U
> >
> /Users/bradley/Java/workspace/project_stable_test/src/java/com/company/project/view/struts/form/entity/FileForm.java
> >
> > Any ideas on this one? Sorry for hi-jacking of my own thread.
>
> This is normal SVN merge behavior. Looks like you are going to have
> fun when you upgrade :)
>
> You probably have a ton of files that have acquired the svn:mergeinfo
> property. Probably empty. Probably created by copying/renaming
> files. SVN 1.5.6 made changes to stop doing this. You should
> systematically remove all occurrences of that property in your
> repository ASAP, and make sure no one is using earlier 1.5.x clients.
>
> When the svn:mergeinfo property exists, every merge will update those
> properties.
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> ------------------------------------------------------
>
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2367527
>
> 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=2367986
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-07-04 18:08:47 CEST