login
Search
Dear all,
I am managing a SVN repository with git-svn, and I created a branch both in my local repository copy and in the remote repository (into its SVN branch directory).
More precisely:
The problem:
I locally merged my local branches by calling into "master" the following command
>git merge gettexted
I solved the conflicts and I commited the modifications into "master" with:
>git commit -a
Now I want to update the remote SVN repository, but the usual couple of commands that I were used to launch do not produce any good output:
>git-svn rebase
>git-svn dcommit
The first command is trying to apply unknown modifications when there has been no updates to the remote repository, and it gives me the following errors (see at the end); while the second command does nothing because it says that I have no clean index and so on...
How can I solve to update the remote SVN repository?
Thanks in advance.
pkz
First, rewinding head to replay your work on top of it...
Applying: Site tree rewrite to use the translation-toolkit
/home/patrick/development/gepolabo-web2/.git/rebase-apply/patch:163867: trailing whitespace.
/home/patrick/development/gepolabo-web2/.git/rebase-apply/patch:163868: trailing whitespace.
/home/patrick/development/gepolabo-web2/.git/rebase-apply/patch:163872: trailing whitespace.
GEPOLABO - Trading application for Linux
/home/patrick/development/gepolabo-web2/.git/rebase-apply/patch:163873: trailing whitespace.
/home/patrick/development/gepolabo-web2/.git/rebase-apply/patch:163874: trailing whitespace.
error: patch failed: en/actu.htm:1
error: en/actu.htm: patch does not apply
error: patch failed: en/menu.html:1
error: en/menu.html: patch does not apply
error: patch failed: en/telechargement.htm:1
error: en/telechargement.htm: patch does not apply
error: patch failed: fr/actu.htm:1
error: fr/actu.htm: patch does not apply
error: patch failed: fr/telechargement.htm:1
error: fr/telechargement.htm: patch does not apply
error: index-copies.en.html: already exists in index
error: index-copies.fr.html: already exists in index
error: index-copies.html.en: does not exist in index
error: index-copies.html.fr: does not exist in index
error: index.en.html: already exists in index
error: index.fr.html: already exists in index
error: index.html.en: does not exist in index
error: index.html.fr: does not exist in index
Using index info to reconstruct a base tree...
:163867: trailing whitespace.
:163868: trailing whitespace.
:163872: trailing whitespace.
GEPOLABO - Trading application for Linux
:163873: trailing whitespace.
:163874: trailing whitespace.
warning: squelched 2696 whitespace errors
warning: 2701 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Applying: First French translation draft
/home/patrick/development/gepolabo-web2/.git/rebase-apply/patch:2091: trailing whitespace.
/home/patrick/development/gepolabo-web2/.git/rebase-apply/patch:2092: trailing whitespace.
/home/patrick/development/gepolabo-web2/.git/rebase-apply/patch:2106: trailing whitespace.
/home/patrick/development/gepolabo-web2/.git/rebase-apply/patch:2107: trailing whitespace.
/home/patrick/development/gepolabo-web2/.git/rebase-apply/patch:18822: trailing whitespace.
error: patch failed: site/actu.htm:1
error: site/actu.htm: patch does not apply
Using index info to reconstruct a base tree...
:2091: trailing whitespace.
:2092: trailing whitespace.
:2106: trailing whitespace.
:2107: trailing whitespace.
:18822: trailing whitespace.
warning: squelched 42 whitespace errors
warning: 47 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging site/actu.htm
CONFLICT (content): Merge conflict in site/actu.htm
Failed to merge in the changes.
Patch failed at 0002.
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
