how to add my project to svn which is already added to svn before in intellij IDEA
I get project by flashdisk which the project directory is already added on SVN(Subversion).
How to connect my project to SVN by using Intellij ? I do not want to commit whole project to its current SVN directory. Could you please help me how to do that ?
If your project's SVN working copy was delivered to you on a USB stick, you can copy it to your computer and open it in IntelliJ IDEA as-is. IDEA should recognize the project as versioned by SVN. Normally, you don't need to re-add it to the remote repository because its already versioned.
You may want to read the documentation at https://www.jetbrains.com/help/idea/using-subversion-integration.html
See also questions close to this topic
SVN merging changes to externals prop
Saving for prosperity as I didn't find anything through the google.
While starting up a project I needed to move some svn:externals properties around. Specifically a couple folders deeper than it currently was. All seemed to be working,
svn propdel svn:externals foldernameand propadd where I wanted it to the external SVN repo I wanted. Everything works, I commit to my branch and then try to merge into trunk. When I got this:
svn: E200007: Can't schedule the working copy at '/rootfolder/buildfolder' from repository 'https://repo/Common' with uuid '$number' for addition under a working copy from repository 'svn+ssh://repo/Common' with uuid '$number'.
Which is apparently just not done as there's nothing online talking about this exact problem. It blocked merge which blocked development.
SVN Authz Permissions Not Working as Expected
I am using a passwd file to list authenticated users as well as an authz file to limit rw access to path based repositories, all through SVN via Apache.
My authz file is shown below:
[aliases] [groups] firmware_team = me,you,him [/] * = someone = r @firmware_team = rw [repo1:/] $authenticated = r
The users are being pulled from the passwd file.
The problem is that currently I can read/write from all repos if I am from the
firmware_teamgroup. However, I cannot write to
repo1even if I am from the
firmware_teamgroup. I can only read from it. My guess is that the magic token
$authenticatedis overwriting the rules set for the
firmware_teamgroup. However the SVN book says the following:
"Restricting users who are part of a group to less than their group's permissions is impossible."
So what do you guys think could be the problem?
If I remove the
$authenticatedmagic token then it works fine, but I don't want anonymous users able to access any of the repos.
Another option for Git revert
I am having an issue where I am trying to use git revert to create a new commit that essentially duplicates an old commit a few steps back in the master branch. I've been stuck on this problem for quite a while as every time i try to run
git revert <sha>i first get this error:
error: Your local changes would be overwritten by revert. hint: Commit your changes or stash them to proceed. fatal: revert failed`
I tried to add, commit, and push and try again but I get the same error and it keeps having me merge the same conflicts over and over. I tried git stash, but still no luck.
git stash Saved working directory and index state WIP on (no branch): <branch> git revert <sha> error: could not revert <sha> hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit'`
At this point, I would just like to clone the repository at the commit I want as the current and add it as the head. I am trying to retain the history of my commits otherwise I would use git checkout.
Any sugggestions would be greatly appreciated!
IntelliJ : Build Failed
I magically encountered several errors at once as I opened my android project-
- Cannot resolve symbol
NOTE : I didn't had a single error in any of my files last time i closed it. Yes, I have seen several answers to this on StackOverflow.
What I did -:
- Rebuilded Project again
- I did => File> Invalidate Caches/Restart.
- Gradle Sync with project Files (it completed successfully with no errors)
- Restarted IntelliJ
I have repeated above steps 2-3 times but i am not able to solve the errors.
This is my build.gradle(app) file: build.gradle
- Cannot resolve symbol
Unable to run grails 3.2.11 in Intellij Idea internal server
It was working fine before. But now this message keeps repeating in console and I cannot run the project anymore:
2018-01-21 09:11:27.720 ERROR --- [ost-startStop-1] o.s.b.c.embedded.tomcat.TomcatStarter : Error starting Tomcat context. Exception: org.springframework.beans.factory.BeanCreationException. Message: Error creating bean with name 'grailsCacheFilter': Cannot create inner bean '(inner bean)#cbcf8d0' of type [grails.plugin.cache.web.filter.simple.MemoryPageFragmentCachingFilter] while setting bean property 'filter'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name '(inner bean)#cbcf8d0': Unsatisfied dependency expressed through method 'setUrlMappingsHandlerMapping' parameter 0; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'urlMappingsHandlerMapping': Unsatisfied dependency expressed through method 'setWebRequestInterceptors' parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'openSessionInViewInterceptor': Cannot resolve reference to bean 'hibernateDatastore' while setting bean property 'hibernateDatastore'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'hibernateDatastore': Bean instantiation via constructor failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [org.grails.orm.hibernate.HibernateDatastore]: Constructor threw exception; nested exception is org.hibernate.tool.schema.extract.spi.SchemaExtractionException: More than one table found in namespace (, ) : user 2018-01-21 09:11:28.515 ERROR --- [ main] o.s.boot.SpringApplication : Application startup failed org.springframework.context.ApplicationContextException: Unable to start embedded container; nested exception is org.springframework.boot.context.embedded.EmbeddedServletContainerException: Unable to start embedded Tomcat at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.onRefresh(EmbeddedWebApplicationContext.java:137) at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:537) at org.springframework.boot.context.embedded.EmbeddedWebApplicationContext.refresh(EmbeddedWebApplicationContext.java:122) at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:762) at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:372) at org.springframework.boot.SpringApplication.run(SpringApplication.java:316) at grails.boot.GrailsApp.run(GrailsApp.groovy:83) at grails.boot.GrailsApp.run(GrailsApp.groovy:388) at grails.boot.GrailsApp.run(GrailsApp.groovy:375) at grails.boot.GrailsApp$run.call(Unknown Source) at org.codehaus.groovy.runtime.callsite.CallSiteArray.defaultCall(CallSiteArray.java:48) at org.codehaus.groovy.runtime.callsite.AbstractCallSite.call(AbstractCallSite.java:113) at org.codehaus.groovy.runtime.callsite.AbstractCallSite.call(AbstractCallSite.java:133) at araniko.Application.main(Application.groovy:8) Caused by: org.springframework.boot.context.embedded.EmbeddedServletContainerException: Unable to start embedded Tomcat at ......
I would really appreciate if you could help me out! Thank you a lot for your time.
Haxe: openfl test works but not lime build
I'm in the process of moving all my projects to individual modules in IntelliJ rather than having one module in the entire git repo, and my IntelliJ builds stopped working. I notice it uses lime builds even though my module is set to openfl (and always has as far as I know)
openfl test flash -debug
lime build GassyRickAstley.xml flash -debug -verbose
this does not. Full gist of both -v
Lime Command-Line Tools (2.9.1) Initializing project... Using project file: GassyRickAstley.xml Warning: Could not read HXCPP config: /Users/booboo/.hxcpp_config.xml Using target platform: FLASH Running command: UPDATE - Embedding asset: removed for brevity - Copying template file: removed for brevity Running command: BUILD - Running command: haxe -main ApplicationMain -cp /usr/local/lib/haxe/lib/flixel/git -D flixel=4.3.0 -cp /usr/local/lib/haxe/lib/openfl/3,6,1 -D openfl=3.6.1 -cp /usr/local/lib/haxe/lib/lime/2,9,1 -D lime=2.9.1 -cp /usr/local/lib/haxe/lib/actuate/1,8,7 -D actuate=1.8.7 -cp /usr/local/lib/haxe/lib/ash/1,5,4/src -D ash=1.5.4 -cp source -cp lib -cp /usr/local/lib/haxe/lib/openfl/3,6,1/extern -cp ../Krakel/source -cp ../../lib/HxAssert/src -D native-trace -D HXCPP_QUIET -D openfl-next -D tools=2.9.1 -D flash-use-stage -D no-compilation -D openfl-flash -D verbose=1 -D web --macro flixel.system.macros.FlxDefines.run() -swf-lib export/flash/obj/assets.swf -swf-version 11.8 -swf export/flash/bin/GassyRickAstley.swf -cp export/flash/haxe -debug georges-mbp:Gassy Rick Astley booboo$
It doesn't seem like anything went wrong, but I'm pretty shit with analyzing terminal output.
For now I can just build manually, but not having breakpoints is gonna get pretty lame, pretty fast. Any help is appreciated.
Bonus question. When I run/test the project in open fl and close the game's window the active terminal process never ends. I have to close the terminal, reopen and cd my directory again. is there a way around this?
TFS 2017 Build Definition with Dynamic Branch as Source
We recently switched to Git and are still working on coming up with a branching/ build/ release strategy that works best for our environment. In short, we've decided to test out the following strategy:
- Create a feature branch off master
- Commit changes to this feature branch until completion
- Deploy this feature branch to our Dev environment. If no issues are found, rebase this branch with master to catch it up, then deploy to UAT for testing.
- If sign-off is received and we're prod ready, merge the feature branch back into master, create a prod deploy branch off master, then deploy that branch to Prod.
This approach will ensure master is always prod-ready. Creating the separate prod releases is a way for us to, if we need, re-deploy a previous version.
Our first attempt at this approach has immediately been stopped by a limitation in our current TFS build definition. We have a build definition where the first step is to obtain the source paths for the changes based on a given Repository and Branch. Here's what that looks like:
As you can see from the image, the source Branch is master. When we push changes to TFS and the build is triggered, it's actually pulling sources from the master branch, rather than the feature branch that triggered the build. When we actual perform a release, the release definition uses the build results, but those results are again from a successful build of the master source, and therefore the wrong source is deployed.
I have a couple workarounds in mind, but neither are ideal:
- Before building the solution, modify the build definition to point to the correct Feature Branch (see image above).
- Create a build definition per feature branch (this is a non-starter, it'd be very time consuming for little benefit).
Ideally, there'd be some way to dynamically set the Branch to the branch that triggered the build. Is this possible? Even if it's through a powershell script, I'm all ears.
Alternatively, if anyone has suggestions on an alternative branching strategy that plays nicely with the TFS build definitions, that'd be well received also.
Version control personally and simply?
- make history for web text/code source files.
- login-worker is only me, i.e personal usage.
- automatically save history for each updated files(no require at once but at least once per week)
- It must be a simple way to start and work.
- I have 3 work places so need to do async files.
- (not must but hopefully for future working environment) Any other non-engineer can also understand the location of history file and can see it easily.
Current way: I made history folder the day, download files in there for edit, copy files when I edit/creat new one.
Advantage of the current way: Very quick and simple, no need to do additional task to make history
Disadvantage of the current way: Messy. Whenever day I work, I create a new history folder to keep downloaded files, so that it is messy in Finder(or windows explore). Also, I don't have a way to Doing Async files for sure with in other places.
I tested to use GIT before, I had Thought GIT automatically save files I edit and save with a editor, but that was not the case. Also GIT is too complicated to use/start. If you recommend GIT, you need to show me ways to deal with the problem I had, for instance, simple GIT GUI with limited options without merging/project/branch etc because of personal usage for maintaining just one website.
Do you know any way to do version control personally and simply?