Re: SVN doesn't like .so files?

[Les Mikesell]

On Fri, Oct 10, 2014 at 2:56 PM, James  wrote:
> After I "import", I have renamed my project folder to project.bak folder and
> created a new empty project folder.  I found this after I do "co" in my new
> project folder.
>
> How can I easily add these .so files or other possible ignored files into
> repository? There are about 900MB data (JDK and Eclipse). I don't want to
> miss any files.

First, make sure this is really what you want to do.  Normally you
would only want 'source' type files that you would check out in
working copies so you can edit and rebuild any binaries from them.  If
you do need some unrelated fixed-version binaries brought along with
every checkout, consider putting them elsewhere (in the same or a
different repository) and using svn:external properties to pull any
tools or supporting libraries into their own subdirectories of the
working space.That way you can separate the versioning of 'your'
project from any separately-managed support tools/code/binaries.  If
you subsequently commit new versions of the tools/libs, you can
control the checked-out version by using peg-revision syntax or tag
copies for your external targets.

> 1. Can I delete the new project folder and rename back the project.bak, and
> then use "svn add ."?

No.

> or
> 2. Copy entire contents of project.bak folder (has ALL files) into the new
> project folder (missing some files), and then do "svn add ."?

Yes.  If you are sure you really want that.

> Does the "svn add ." can find new files and ignore existing files to add
> onto repository, after commit?

I'm not sure if the svn:ignore becomes a remembered property after the
first run or if it is strictly a client setting.  You'll be able to
tell by what the svn add command shows, though.  If it isn't taking
them, explicitly putting the filenames on the command line will work
and, at least on unix-like systems you can use wildcards like * */*
*/*/*, etc,. to have the shell expand all the filenames for you.

-- 
   Les Mikesell
 lesmikes...@gmail.com

Re: SVN doesn't like .so files?

[James]

After I "import", I have renamed my project folder to project.bak folder and 
created a new empty project folder.  I found this after I do "co" in my new 
project folder.

How can I easily add these .so files or other possible ignored files into 
repository? There are about 900MB data (JDK and Eclipse). I don't want to miss 
any files.

1. Can I delete the new project folder and rename back the project.bak, and 
then use "svn add ."? 

or
2. Copy entire contents of project.bak folder (has ALL files) into the new 
project folder (missing some files), and then do "svn add ."? 

Does the "svn add ." can find new files and ignore existing files to add onto 
repository, after commit?

Thanks,
James



On Friday, October 10, 2014 2:35 PM, David Chapman  wrote:
 


On 10/10/2014 11:19 AM, James wrote:

I am trying to add an existing project into the SVN repository. It seems work 
but when I check them out in a new location, I found all .so files are not 
present.  Then I look at the repository, these .so files from JDK are not there.
>
>
>Any workaround? I am using 1.8.10(r1615264) svn. The command I used to add 
>project is "svn import -m "my message" . svn://homeNetworkIP/repositoryName".
>
>
>Please help,
>
>
>Thanks,
>James
>
Look in "~/.subversion/config", section "[miscellaneous]" for
"global-ignores".  This is a listing of files that are ignored by
default when you import a directory.  You can add any file manually,
but derived files like "*.o", "*.so", and "*.exe" (Windows) are
often not added to the repository and so they tend to be omitted
from automated processes.

You can of course change the configuration file so that "*.so" files
are not automatically excluded.

--  David Chapman dcchap...@acm.org Chapman Consulting -- San Jose, CA Software 
Development Done Right. www.chapman-consulting-sj.com

Re: SVN doesn't like .so files?

[David Chapman]

On 10/10/2014 11:19 AM, James wrote:
I am trying to add an existing project into the SVN repository. It 
seems work but when I check them out in a new location, I found all 
.so files are not present.  Then I look at the repository, these .so 
files from JDK are not there.


Any workaround? I am using 1.8.10(r1615264) svn. The command I used to 
add project is "svn import -m "my message" . 
svn://homeNetworkIP/repositoryName".


Please help,

Thanks,
James


Look in "~/.subversion/config", section "[miscellaneous]" for 
"global-ignores".  This is a listing of files that are ignored by 
default when you import a directory.  You can add any file manually, but 
derived files like "*.o", "*.so", and "*.exe" (Windows) are often not 
added to the repository and so they tend to be omitted from automated 
processes.


You can of course change the configuration file so that "*.so" files are 
not automatically excluded.


--
David Chapman  dcchap...@acm.org
Chapman Consulting -- San Jose, CA
Software Development Done Right.
www.chapman-consulting-sj.com

Re: SVN doesn't like .so files?

[Les Mikesell]

On Fri, Oct 10, 2014 at 1:19 PM, James  wrote:
> I am trying to add an existing project into the SVN repository. It seems
> work but when I check them out in a new location, I found all .so files are
> not present.  Then I look at the repository, these .so files from JDK are
> not there.
>
> Any workaround? I am using 1.8.10(r1615264) svn. The command I used to add
> project is "svn import -m "my message" .
> svn://homeNetworkIP/repositoryName".
>

The client where you committed was most likely configured to ignore
*.so files (and other common binary build results).   You can override
this by explictly doing an 'svn add' of missing files and committing
them, or you can change the client configuration if you want different
default behavior.

-- 
   Les Mikesell
 lesmikes...@gmail.com

Re: SVN doesn't like .so files?

[jblist]

On Oct 10, 2014, at 11:19 AM, James  wrote:

> I am trying to add an existing project into the SVN repository. It seems work 
> but when I check them out in a new location, I found all .so files are not 
> present.  Then I look at the repository, these .so files from JDK are not 
> there.
> 
> Any workaround? I am using 1.8.10(r1615264) svn. The command I used to add 
> project is "svn import -m "my message" . svn://homeNetworkIP/repositoryName".
> 
> Please help,
> 
> Thanks,
> James

By default, subversion will ignore .so files, since those are derived by 
compiling source files. If you performed "svn add" specifying a directory, the 
.so files would not have been included. If you really want to include .so 
files, you can explicitly add them.

To see what subversion has ignored, you can do "svn status --no-ignore".

Global ignores are configured in ~/.subversion/config in the "miscellany" 
section, using the global-ignores property.

SVN doesn't like .so files?

[James]

I am trying to add an existing project into the SVN repository. It seems work 
but when I check them out in a new location, I found all .so files are not 
present.  Then I look at the repository, these .so files from JDK are not there.

Any workaround? I am using 1.8.10(r1615264) svn. The command I used to add 
project is "svn import -m "my message" . svn://homeNetworkIP/repositoryName".

Please help,

Thanks,
James

RE: Exception reporting

[John Maher]

I was supposed to do a reply all to keep the thread up to date and also let 
others see the issue.

If you're not sure if the issue is raised already you can always search.  
Search is your friend.

Did you follow the recommendation from the link you posted?

What happens if you get a new working copy?

JM

From: Kumar Krishnamoorthy [mailto:rkrishnamoor...@seamlesscms.com]
Sent: Thursday, October 09, 2014 7:30 PM
To: John Maher
Subject: RE: Exception reporting

Oops. Sorry, I was in the middle of something when I got this error, so just 
skimmed through the message and took and screenshot and sent it. This time I 
really took the time to read the message and found that it's the same error 
reported here.

http://stackoverflow.com/questions/23991573/subversion-reported-a-malfunction-action-svn-wc-conflict-action-delete-on-l

Only difference I see is the version number in my message in 1.8.8
Not sure if it has an issue raised already.

I was trying to checkout spring-net from GitHub using Subversion url
https://github.com/spring-projects/spring-net

But the checkout operation completed with some error. I did a cleanup and did 
update and that's when I got this error.
I think the real problem was in the checkout process, which might have left my 
local copy in a stale state.
And I should not have done an update and instead just deleted the whole repo 
and checkout again.
But didn't bother with it and went with git for now.

Hope that's enough information. Let me know if you need any more details.

Thanks,



Kumar Krishnamoorthy
Developer
Seamless | Leaders in Government WCM
Follow us on Twitter: @seamlesscms

Phone: +613 9913 0020
E-mail: rkrishnamoor...@seamlesscms.com
www.seamlesscms.com



[cid:image002.png@01CFE46F.1F1B9D80]

From: John Maher [mailto:jo...@rotair.com]
Sent: Wednesday, 8 October 2014 10:49 PM
To: Kumar Krishnamoorthy
Subject: RE: Exception reporting

HI Kumar

Thanks for reporting, however this report is useless.  Graphics files are not 
supported in this help system so many will not even see any exception.  All 
they will see is "Just reporting it because by subversion client asked me to 
report it :-)" which doesn't tell them anything.

JM

From: Kumar Krishnamoorthy [mailto:rkrishnamoor...@seamlesscms.com]
Sent: Wednesday, October 08, 2014 3:02 AM
To: users@subversion.apache.org
Subject: Exception reporting

Just reporting it because by subversion client asked me to report it :-)

[cid:image003.png@01CFE46F.1F1B9D80]

Cheers,

Kumar Krishnamoorthy
Developer
Seamless | Leaders in Government WCM
Follow us on Twitter: @seamlesscms

Phone: +613 9913 0020
E-mail: rkrishnamoor...@seamlesscms.com
www.seamlesscms.com



[cid:image002.png@01CFE46F.1F1B9D80]

Re: overriding .subversion/config[helpers] on the command line

[Stefan Sperling]

On Fri, Oct 10, 2014 at 10:27:46AM +0200, Stefan Sperling wrote:
> On Fri, Oct 10, 2014 at 12:53:16AM -0700, Perry Hutchison wrote:
> > I have entries for diff3-cmd and merge-tool-cmd in the [helpers]
> > section of .subversion/config, and they seem to be working properly.
> > However, when running "svn merge --dry-run", I sometimes want all
> > merge and diff3 attempts to "fail" because I just want the report
> > of what files would be updated, without trying to actually merge
> > any files and especially without requiring any interaction.
> > I would prefer to specify this override on the command line rather
> > than having to edit, and subsequently restore, ~/.subversion/config.
> > 
> > It appears that I can override the diff3-cmd setting by adding
> > --diff3-cmd=/bin/false to the command, but when I try to do the
> > same thing to merge-tool-cmd (by adding --merge-tool-cmd=/bin/false)
> > I get an error message:
> > 
> >   svn: invalid option: --merge-tool-cmd=/bin/false
> > 
> > How do I go about overriding the merge-tool-cmd setting on the svn
> > command line?  I found nothing pertinent in the svn 1.6 book, nor in
> > the archives.
> > 
> > svn version 1.6.17 (r1128011) on Ubuntu 12.04, in case it matters.
> > 
> > Please Cc.
> 
> Try --config-option:config:global:merge-tool-cmd=/bin/false

Sorry, got the section name wrong:
  --config-option:config:helpers:merge-tool-cmd=/bin/false

Re: overriding .subversion/config[helpers] on the command line

[Stefan Sperling]

On Fri, Oct 10, 2014 at 12:53:16AM -0700, Perry Hutchison wrote:
> I have entries for diff3-cmd and merge-tool-cmd in the [helpers]
> section of .subversion/config, and they seem to be working properly.
> However, when running "svn merge --dry-run", I sometimes want all
> merge and diff3 attempts to "fail" because I just want the report
> of what files would be updated, without trying to actually merge
> any files and especially without requiring any interaction.
> I would prefer to specify this override on the command line rather
> than having to edit, and subsequently restore, ~/.subversion/config.
> 
> It appears that I can override the diff3-cmd setting by adding
> --diff3-cmd=/bin/false to the command, but when I try to do the
> same thing to merge-tool-cmd (by adding --merge-tool-cmd=/bin/false)
> I get an error message:
> 
>   svn: invalid option: --merge-tool-cmd=/bin/false
> 
> How do I go about overriding the merge-tool-cmd setting on the svn
> command line?  I found nothing pertinent in the svn 1.6 book, nor in
> the archives.
> 
> svn version 1.6.17 (r1128011) on Ubuntu 12.04, in case it matters.
> 
> Please Cc.

Try --config-option:config:global:merge-tool-cmd=/bin/false

overriding .subversion/config[helpers] on the command line

[Perry Hutchison]

I have entries for diff3-cmd and merge-tool-cmd in the [helpers]
section of .subversion/config, and they seem to be working properly.
However, when running "svn merge --dry-run", I sometimes want all
merge and diff3 attempts to "fail" because I just want the report
of what files would be updated, without trying to actually merge
any files and especially without requiring any interaction.
I would prefer to specify this override on the command line rather
than having to edit, and subsequently restore, ~/.subversion/config.

It appears that I can override the diff3-cmd setting by adding
--diff3-cmd=/bin/false to the command, but when I try to do the
same thing to merge-tool-cmd (by adding --merge-tool-cmd=/bin/false)
I get an error message:

  svn: invalid option: --merge-tool-cmd=/bin/false

How do I go about overriding the merge-tool-cmd setting on the svn
command line?  I found nothing pertinent in the svn 1.6 book, nor in
the archives.

svn version 1.6.17 (r1128011) on Ubuntu 12.04, in case it matters.

Please Cc.