I have a git-svn configuration as follows:
[svn-remote "svn"]
rewriteRoot = http://myproject
url = http://myserver/myproject/trunk/proj
fetch = :refs/remotes/git-svn
My company decided to move the directory trunk to v100 (at revision xxxxx).
After the move, I updated the url attribute but I am no longer able to do a git svn rebase. git-svn chokes with some SVN error (Cannot replace a directory from within).
A fresh checkout fetches only revisions newer than xxxxx.
How can I get all revisions and still have continuous history?
I think we had configured the git-svn sync wrongly. We should have used:
[svn-remote "svn"]
rewriteRoot = http://myproject
url = http://myserver/myproject
fetch = trunk/proj:refs/remotes/git-svn
That is, "trunk/proj" should have been part of the "fetch". If I make a fresh git svn clone with this, I am able to get previous versions as well.
Related
I am using WebStorm and trying to upload my code to the SVN repository.
I am not able to share my project or commit anything as SVN is configured to require TeamTrack ID.
Where and how should I provide this TeamTrack ID with my code?
How can I integrate Issue Tracking System with Webstorm SVN Plugin?
Steps followed in WebStorm:
VCS —> Import into Version Control —> Share project(subversion) —> Select repo —> Commit Message —> Share
Following is the error message I am receiving:
Error:svn: E165001: Commit blocked by pre-commit hook (exit code 1) with
output:
svnlook: E200017: Property 'bugtraq:enable' not found on path '/branches/XYZ_Project' in transaction 120353-1rhc
The TeamTrack ID is required.
As per Stanbol documentation, I've checked-out source code (% svn co http://svn.apache.org/repos/asf/stanbol/trunk stanbol) and after did maven build. All is fine. Now I've started executable jar (org.apache.stanbol.launchers.full-1.0.0-SNAPSHOT).
After starting this I do not see any menu option to open CMSAdapter and contenthub. I can only see /enhancer, /topic, /entityhub, /sparql, /ontonet, /rules, and /reasoners in the menu option.
Here is the localhost page -
When I saw the checked-out directory then I did not find folders corresponding to cmsadpater and contenthub.
After I tried to download complete zip from source again and now i can see cmsadpater and contenthub -
But I'm getting error during build.
Please suggest what I'm missing here.
[ERROR] Failed to execute goal on project org.apache.stanbol.launchers.full: Could not resolve dependencies for project org.apache.stanbol:org.apache.stanbol.launchers.full:jar:0.12.0: Failure to find org.apache.sling:org.apache.sling.launchpad:xml:bundlelist:8 in https://repo.maven.apache.org/maven2 was cached in the local repository, resolution will not be reattempted until the update interval of central has elapsed or updates are forced
ContentHub and CMSAdapter components have been discontinued from version 1.x. You can still find them at 0.12.x branch (https://svn.apache.org/repos/asf/stanbol/branches/release-0.12/)
Hope that helps
I'm following the installation and setup instructions for stencil found here. Everything seems to have worked correctly until I run the jspm install command. Here is the output:
$ jspm install
Looking up npm:lodash
Updating registry cache...
Looking up github:bigcommerce-stencil/stencil-utils
Looking up github:bigcommerce-stencil/citadel
Looking up github:jspm/nodelibs-url
Looking up github:vakata/jstree
Looking up github:hubspot/pace
warn Using local override for github:hubspot/pace#1.0.2
Looking up github:jackmoore/zoom
Looking up github:browserstate/history.js
Looking up github:asyncly/EventEmitter2
Looking up github:ftlabs/fastclick
Looking up github:kenwheeler/slick
Looking up github:casperin/nod
Looking up github:components/jquery
Looking up github:caolan/async
Looking up github:bigcommerce-labs/foundation
err Repo github:bigcommerce-stencil/citadel not found!
warn Installation changes not saved.
If I run the command again, it looks like the github:bigcommerce-stencil/stencil-utils repo is not found:
$ jspm install
Looking up npm:lodash
Updating registry cache...
Looking up github:bigcommerce-stencil/citadel
Looking up github:bigcommerce-stencil/stencil-utils
Looking up github:jspm/nodelibs-url
Looking up github:casperin/nod
Looking up github:kenwheeler/slick
Looking up github:asyncly/EventEmitter2
Looking up github:vakata/jstree
Looking up github:browserstate/history.js
Looking up github:hubspot/pace
warn Using local override for github:hubspot/pace#1.0.2
Looking up github:bigcommerce-labs/foundation
Looking up github:components/jquery
Looking up github:jackmoore/zoom
Looking up github:ftlabs/fastclick
Looking up github:caolan/async
Downloading npm:lodash#3.10.1
Downloading github:hubspot/pace#1.0.2
Downloading github:jspm/nodelibs-url#0.1.0
Downloading github:casperin/nod#2.0.10
Downloading github:browserstate/history.js#1.8.0
Downloading github:bigcommerce-labs/foundation#5.5.3
Downloading github:vakata/jstree#3.2.1
Downloading github:asyncly/EventEmitter2#0.4.14
Downloading github:jackmoore/zoom#1.7.14
Downloading github:ftlabs/fastclick#1.0.6
Downloading github:kenwheeler/slick#1.5.5
err Repo github:bigcommerce-stencil/stencil-utils not found!
warn Installation changes not saved.
If I run it again, I get the original output. It seems to keep randomly changing. So, the question is, why can't these repos be found?
I know I have access to the repos because if I try to clone it directly, it works fine with the command:
git clone https://github.com/bigcommerce-stencil/citadel.git
Any idea?
The problem that was causing this was the Github Access Token required repo to be checked and not just the subresources associated with repo. Stencil documentation has been updated to reflect this.
I want to lock down my ember-cli project's version of ember-data to this commit, which updates the map function signatures and lets ED work with Ember 1.8.
I tried using the canary instructions as a template and doing this, and adding this to my bower.json:
"ember-data": "components/ember-data#f97d5c9adbabd7f6b4935e614bc95e49b66bb7e0",
and
"resolutions": {
"ember-data": "#f97d5c9adbabd7f6b4935e614bc95e49b66bb7e0"
}
but I'm getting the following error:
Additional error details:
fatal: reference is not a tree: f97d5c9adbabd7f6b4935e614bc95e49b66bb7e0
Solution:
You'll need to reference the sha in the canary branch of components/ember-data, not the one from emberjs/ember-data.
In your case the sha you want is 11715a514ec33ed32438d818ee501865cd4cd2c7 commit here
Update your sha's to that and you're good to go!
How I found this info:
The components/ember-data github repo autobuilds a new version on the canary branch with each commit to ember-data. The way I found the sha you needed is by looking at the commit history and finding the same day, and then the comment that contained the sha you wanted
Whilst doing git svn clone -s https://svn.example.com/repo/ I received the following output:
r3073 = a6132f3a937b632015e66d694250da9f606b8333 (refs/remotes/trunk)
Found possible branch point: https://svn.example.com/repo/trunk => https://svn.example.com/repo/branches/v1.3, 3073
W: Refspec glob conflict (ref: refs/remotes/trunk):
expected path: repo/branches/trunk
real path: repo/trunk
Continuing ahead with repo/trunk
W: Refspec glob conflict (ref: refs/remotes/trunk):
expected path: repo/branches/trunk
real path: repo/trunk
Continuing ahead with repo/trunk
W: Refspec glob conflict (ref: refs/remotes/trunk):
expected path: repo/branches/trunk
real path: repo/trunk
Continuing ahead with repo/trunk
W: Refspec glob conflict (ref: refs/remotes/trunk):
expected path: repo/branches/trunk
real path: repo/trunk
Continuing ahead with repo/trunk
fatal: Not a valid object name refs/remotes/tags/Sync Controllers
cat-file commit refs/remotes/tags/Sync Controllers: command returned error: 128
Running git branch -a gives:
remotes/tags/Sync%20Controllers
remotes/tags/v1.1
remotes/trunk
remotes/v1.2
I think the problem is that "remotes/tags/Sync Controllers" != "remotes/tags/Sync%20Controllers".
The tag on SVN has a space in it, but the tag in git had this space converted to %20 (URL encoded). To solve it just manually add a new tag with the verbatim name:
cd .git/refs/remotes/tags/
mv Sync%20Controllers Sync\ Controllers
Then run the git svn clone command again.
(Normally you'd do this with git tag OLDTAG NEWTAG but git was not allowing me to define a tag with a space in. The tag files are simply text files containing the hash of the relevant commit.)
You may use git-svn server-side alternative, SubGit in order to avoid many of git-svn translation problems.
I'm a SubGit developer and could say that we worked a lot to resolve character translation issues like the one above; in this particular case tag would be translated to a refs/tags/Sync+Controllers tag.
Note also, that git-svn has translated Subversion tag as a branch instead of a tag.
I ran into this issue today, and considered this branch which contains a pace in it is not important, i just run
git branch -r -d partialPayment%202.4
And re-run git svn fetch
It skipped current branch and continue grabbing the next one.
I'm using git 1.29.2 and getting the issue too. Additionlly it is running into a Windows Server 2016 and git is under cygwin.
Was checking into /GitMigration/.git/svn/refs/remotes/origin, and the folder is there with blank spaces not %20 so nothing to change on it.
However into the packed-refs the tag that is producing the problem does not appears, no name and no hash.
The problem should has another related issue with something else that produce the error, not just this.
Looking into the ./.git/config found a series of repetitions of the following lines:
branches = server/branches/*:refs/remotes/origin/*
tags = server/tags/*:refs/remotes/origin/tags/*
That are producing each time i did run the git-svn clone sentence. So i did remove those from the config file, save it and run again, but this time using git svn fetch, to prevent get again the lines duplicated, and voala !! Problem solved.
I believe the problem with spaces is fixed in Git >= 1.8.0 (See: #786942).
So you should upgrade it.
I've tested it and it seems to work in the recent version of git.
See GitHub Home page: https://github.com/git/git