Re: svn conflict
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 anyone else is following along at home... > > I did the move on the repository but still had a conflict as svn locally > believed the directory had the old name. So I deleted > sysutils/MacPorts-daemondo locally and checked-out a new copy from the > server. All seems well, now. That'll work. Or following the update instructions in the Subversion FAQ item linked to above should work too. ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: svn conflict
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 directory macports_daemondo does not match port name MacPorts_daemondo ---> 1 errors and 1 warnings found. I'm an svn newbie, where/how does the RCS tag get set? I thought it was something that was automatically added by svn. You manually put the line "# $Id$" as the second line of the portfile, after the modeline. Subversion fills in the details. https://guide.macports.org/chunked/development.creating-portfile.html Should I now do 'svn move sysutils/macports_daemondo sysutils/MacPorts-daemondo' ? Don't want to screw this up more... 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 anyone else is following along at home... I did the move on the repository but still had a conflict as svn locally believed the directory had the old name. So I deleted sysutils/MacPorts-daemondo locally and checked-out a new copy from the server. All seems well, now. Craig ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: svn conflict
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 >> MacPorts_daemondo >> ---> 1 errors and 1 warnings found. > > I'm an svn newbie, where/how does the RCS tag get set? I thought it was > something that was automatically added by svn. You manually put the line "# $Id$" as the second line of the portfile, after the modeline. Subversion fills in the details. https://guide.macports.org/chunked/development.creating-portfile.html > Should I now do 'svn move sysutils/macports_daemondo > sysutils/MacPorts-daemondo' ? Don't want to screw this up more... 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 ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: svn conflict
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, 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 Might this be, because the underlaying FS is not case-sensitive (only case-preserving) so the two names would identify basically the same directory? Have you used `svn mv` to capitalise the name? Or how did you get into the current state? I don't know how it got out of sync. I thought I committed it with uppercase in the directory name. Anyway, I just changed the local directory name to lowercase, did 'svn update' and the conflict is gone. You probably had the directory "MacPorts_daemondo" on disk, but ran "svn add macports_daemondo" which scheduled it for addition in the all-lowercase version. Subversion is always case-sensitive, even on case-insensitive-but-case-preserving filesystems. I can live with the lowercase directory name. Note: $ 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 MacPorts_daemondo ---> 1 errors and 1 warnings found. I'm an svn newbie, where/how does the RCS tag get set? I thought it was something that was automatically added by svn. Should I now do 'svn move sysutils/macports_daemondo sysutils/MacPorts-daemondo' ? Don't want to screw this up more... Craig ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: svn conflict
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 craigtreleaven$ svn status >>> ? sysutils/MacPorts_daemondo >>> ! C sysutils/macports_daemondo >>> > local add, incoming add upon update >> >> Might this be, because the underlaying FS is not case-sensitive (only >> case-preserving) so the two names would identify basically the same >> directory? >> >> Have you used `svn mv` to capitalise the name? Or how did you get into the >> current state? > > I don't know how it got out of sync. I thought I committed it with uppercase > in the directory name. Anyway, I just changed the local directory name to > lowercase, did 'svn update' and the conflict is gone. You probably had the directory "MacPorts_daemondo" on disk, but ran "svn add macports_daemondo" which scheduled it for addition in the all-lowercase version. Subversion is always case-sensitive, even on case-insensitive-but-case-preserving filesystems. > I can live with the lowercase directory name. Note: $ 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 MacPorts_daemondo ---> 1 errors and 1 warnings found. ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
Re: svn conflict
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 craigtreleaven$ svn status ? sysutils/MacPorts_daemondo ! C sysutils/macports_daemondo > local add, incoming add upon update Might this be, because the underlaying FS is not case-sensitive (only case-preserving) so the two names would identify basically the same directory? Have you used `svn mv` to capitalise the name? Or how did you get into the current state? I don't know how it got out of sync. I thought I committed it with uppercase in the directory name. Anyway, I just changed the local directory name to lowercase, did 'svn update' and the conflict is gone. I can live with the lowercase directory name. Thanks, Craig ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
svn conflict
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: $ svn resolve --accept theirs-conflict sysutils/MacPorts_daemondo but the conflict remains. How do I resolve this? Craig ___ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
