As a work around, I'm doing merge in svn and git then, replacing the svn
files with git files.

But, is it hard to do something like...
If a mergeinfo prop is added to a directory. For every file in that
directory, before adding a file, go and check if that file was part of any
revision.

On Tue, Jul 21, 2015, 5:43 AM Konstantin Khomoutov <
flatw...@users.sourceforge.net> wrote:

> On Mon, 20 Jul 2015 15:16:34 -0700 (PDT)
> Chidveer Reddy <chidv...@gmail.com> wrote:
>
> >    I have an SVN repo.
> >       Repo
> >         |_ branch 1
> >         |
> >         |_trunk.
> >
> >  1. As an SVN user, i added a new file to "branch 1" (file1.txt)
> >  2. Now, i went to the git console and using git-svn, I did a fetch
> > and merge to trunk (from branch 1 to trunk).
> >      Merge went well and i did a "DCommit".
> >  3. After dcommit the svn:mergeinfo properly was set properly.
> >     But, the file that i have added "file1.txt" was sent to svn as a
> > "new file" it should be as "copied-from-path". Screenshot as below.
> > [image: Inline image 3]
> >
> > Note:
> >   If i do a merge in svn it will preserve the file inheritance, as
> > the screenshot below.
> >   it says, the file "Branch 5.6 file 1 -copy.txt" came form
> > "branches/5.6/" [image: Inline image 1]
>
> I don't know the internals of git-svn, but I'm afraid you're out of
> luck here: Git does not keep any information about file "copies" and/or
> "renames" -- this concept simply does not exist in Git.  So you can't
> really achieve 1-to-1 mapping between Git and Subversion.
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to