Databases
StackOverflow2013
Postsdbo
POGIT SVN dcommit after folder rename
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGIT SVN dcommit after folder rename
    primarykey
    data
    text
    <p>I have not been able to find a similar answer to my question.</p> <p>Situation:</p> <p>Locally using GIT (git version 1.7.3.1.msysgit.0)<br> Remote repository is SVN (not sure of version)</p> <hr> <p>Problem:</p> <p>Clone an SVN repo, add a folder, commit it to git and SVN, rename the folder (without telling git), commit to git, cannot commit anymore to SVN.</p> <hr> <p>Issue Steps (SVN repo has one file in it main.as in the root folder)</p> <ol> <li><strong>clone</strong> branch from SVN repo (now have one file locally)</li> <li><strong>commit</strong> to git locally (including <code>git add .</code>)</li> <li>create <strong>oldFolder</strong> with a file in it</li> <li><strong>commit</strong> to git locally (including <code>git add .</code>)</li> <li><strong>dcommit</strong> to SVN</li> <li><strong>rename</strong> oldFolder -> <strong>newFolder</strong> (rename with IDE or manually - not <code>git-mv</code>)</li> <li><strong>commit</strong> to git locally (including <code>git-add .</code>)</li> <li><strong>dcommit</strong> to SVN (don't need SVN rebase since I'm the only one committing changes to SVN)</li> </ol> <p><strong>PROBLEM</strong>: The git-svn dcommit responds: </p> <pre><code>oldFolder/file.txt: needs update update-index --refresh: command returned error: 1 </code></pre> <hr> <p>What I tried:</p> <ul> <li>stash, commit, dcommit, stash apply <strong>(same thing:needs update)</strong></li> <li>stash, rebase, stash apply, commit, dcommit <strong>(same thing:needs update)</strong> </li> <li>stash, rebase, stash apply, commit, stash, dcommit <strong>(same thing:needs update)</strong></li> </ul> <hr> <p>The one that semi-worked was to call:</p> <pre><code>svn rm -r oldFolder </code></pre> <p>but this ended up with <code>oldFolder</code> and <code>newFolder</code> in SVN... whereas I want <code>oldFolder</code> to be either renamed or deleted (I don't mind losing the history in this case).</p> <p>I need the SVN repo to reflect my local git master/branch...</p> <hr> <p><em>Why am I renaming files without the git command?<br> I work with large file structures and the IDEs that im using for refactoring old code renames multiple folders and files causing the above scenario. I cannot keep track and call git rm on every folder removed.</em></p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USJason Plank
    1. USmihai
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. COAre you sure you don't need to do a `git svn rebase` first? Looks like there are svn changes which you don't have yet.
      singulars
      1. POGIT SVN dcommit after folder rename
      1. USMike Weller
    2. COthank you for the suggestion. git svn rebase will result in the same issue. Also I'm the only person currently dcommitting to svn right now.
      singulars
      1. POGIT SVN dcommit after folder rename
      1. USmihai
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload