Re: svn conflict

2014-10-18 Thread Craig Treleaven
At 12:45 PM +0200 10/18/14, Peter Danecek wrote: On 18 Oct 2014, at 02:55, Craig Treleaven ctrelea...@macports.org wrote: I've ended up with an svn conflict--just in the capitalization of the directory name, if I'm reading this right. SixBare:mp-trunk-ports craigtreleaven$ svn status

Re: svn conflict

2014-10-18 Thread Ryan Schmidt
On Oct 18, 2014, at 8:22 AM, Craig Treleaven wrote: At 12:45 PM +0200 10/18/14, Peter Danecek wrote: On 18 Oct 2014, at 02:55, Craig Treleaven wrote: I've ended up with an svn conflict--just in the capitalization of the directory name, if I'm reading this right. SixBare:mp-trunk-ports

Re: svn conflict

2014-10-18 Thread Craig Treleaven
At 10:59 AM -0500 10/18/14, Ryan Schmidt wrote: On Oct 18, 2014, at 8:22 AM, Craig Treleaven wrote: At 12:45 PM +0200 10/18/14, Peter Danecek wrote: On 18 Oct 2014, at 02:55, Craig Treleaven wrote: I've ended up with an svn conflict--just in the capitalization of the directory name

Re: svn conflict

2014-10-18 Thread Ryan Schmidt
On Oct 18, 2014, at 11:18 AM, Craig Treleaven wrote: At 10:59 AM -0500 10/18/14, Ryan Schmidt wrote: $ port lint MacPorts_daemondo --- Verifying Portfile for MacPorts_daemondo Warning: Line 2 is missing RCS tag ($Id$) Error: Portfile directory macports_daemondo does not match port name

Re: svn conflict

2014-10-18 Thread Craig Treleaven
At 11:24 AM -0500 10/18/14, Ryan Schmidt wrote: On Oct 18, 2014, at 11:18 AM, Craig Treleaven wrote: At 10:59 AM -0500 10/18/14, Ryan Schmidt wrote: $ port lint MacPorts_daemondo --- Verifying Portfile for MacPorts_daemondo Warning: Line 2 is missing RCS tag ($Id$) Error: Portfile

Re: svn conflict

2014-10-18 Thread Ryan Schmidt
On Oct 18, 2014, at 12:33 PM, Craig Treleaven wrote: Yes, you should fix the case of the directory. Since you have a case-insensitive filesystem, you'll need to do the move in the repository, rather than in your working copy: https://subversion.apache.org/faq.html#case-change In case

svn conflict

2014-10-17 Thread Craig Treleaven
Hi: I've ended up with an svn conflict--just in the capitalization of the directory name, if I'm reading this right. SixBare:mp-trunk-ports craigtreleaven$ svn status ? sysutils/MacPorts_daemondo ! C sysutils/macports_daemondo local add, incoming add upon update I tried