View Issue Details

Jump to NotesJump to History
IDProjectCategoryView StatusDate SubmittedLast Update
0004538Slicer4Core: Building (CMake, Superbuild)public2018-04-10 09:352018-04-10 10:51
Reporterpieper Assigned Tojcfr  
PrioritynormalSeverityblockReproducibilityhave not tried
Status closedResolutionfixed 
Product Version 
Target VersionFixed in Version 
Summary0004538: .circleci file breaks git svn
Description

git svn rebase gives this message:

r27133 = 4d27722cbc253e7728388cf79b75b9e4e7f42024 (refs/remotes/git-svn)
First, rewinding head to replay your work on top of it...
Applying: ENH: Switch continuous integration to CircleCI 2.0
Using index info to reconstruct a base tree...
A circle.yml
.git/rebase-apply/patch:48: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...

And then when trying to commit this error is generate:

pieper@u:~/slicer4/latest/Slicer$ git svn dcommit --add-author-from
Committing to http://svn.slicer.org/Slicer4/trunk ...

ERROR from SVN:
URL access forbidden for unknown reason: Access to '/Slicer4/!svn/rvr/27133/trunk/.circleci' forbidden
W: 96ee6569bde32f95ce413cfa97275dd1c0a071d6 and refs/remotes/git-svn differ, using rebase:
:040000 000000 b89174033c6c851d22c1988b619871f7de33aaa9 0000000000000000000000000000000000000000 D .circleci
:100644 100644 970bdbef819950ca5437f5cabe98b52693f3929f 23970ee91c793f75c365f12cc9a24979d5e0d250 M .gitignore
:040000 040000 60e8aa862234a23e0daf44cd7409cd798d608958 152d432a004941e9e705281406efa6a58d469ba6 M Libs
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.

TagsNo tags attached.

Activities

alexis.girault

alexis.girault

2018-04-10 10:14

developer   ~0015656

Last edited: 2018-04-10 10:20

View 2 revisions

svn and git seems to have diverged after doing svn rebase on top of master.
However, revision 27128 seems clean: http://viewvc.slicer.org/viewvc.cgi/Slicer4?view=revision&revision=27128



Screen Shot 2018-04-10 at 10.13.31 AM.png (337,330 bytes)
pieper

pieper

2018-04-10 10:29

administrator   ~0015657

Alexis found that this fixes the local checkout:

git update-ref refs/remotes/git-svn refs/remotes/origin/master
git svn rebase

This seems to work for me as well - nice!
pieper

pieper

2018-04-10 10:51

administrator   ~0015658

Resetting refs or new checkout fixes the issue.

Issue History

Date Modified Username Field Change
2018-04-10 09:35 pieper New Issue
2018-04-10 09:35 pieper Status new => assigned
2018-04-10 09:35 pieper Assigned To => jcfr
2018-04-10 10:14 alexis.girault File Added: Screen Shot 2018-04-10 at 10.13.31 AM.png
2018-04-10 10:14 alexis.girault Note Added: 0015656
2018-04-10 10:20 alexis.girault Note Edited: 0015656 View Revisions
2018-04-10 10:29 pieper Note Added: 0015657
2018-04-10 10:51 pieper Status assigned => closed
2018-04-10 10:51 pieper Resolution open => fixed
2018-04-10 10:51 pieper Note Added: 0015658