From: "Motiejus Jakštys" <desired.mta@gmail.com>
To: ryanzec <basire@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: What Features Do I loose With git-svn?
Date: Fri, 29 Apr 2011 18:16:29 +0100 [thread overview]
Message-ID: <20110429171629.GA3394@jakstys.lt> (raw)
In-Reply-To: <1304096029355-6317576.post@n2.nabble.com>
On Fri, Apr 29, 2011 at 09:53:49AM -0700, ryanzec wrote:
> I want to use git for a project I am working on however because the project
> is going to possibility have a lot of binary content in size and number of
> files (game project), it is probably going to be hard to convince my team to
> make the switch since I have no real solution besides just use git for the
> code and svn for the binary data. I am hoping git-svn will do the trick for
> me. The question is are they any features I loose (like cherry picking) or
> anything that I have to look out for (does updating from svn cause merging
> issues just like working all in SVN does). Right now the only things I know
> to look out for is:
>
> <ul>
> <li>Instead of git pull/push I have to use the git-svn equivalents</li>
> <li>If I have changes that are not in the index and I need to pull the
> latest code form SVN, I have to stash first, update from svn, and then apply
> the stash back.</li>
> </ul>
This list does not support HTML. Thankfully. :)
>
> Any other things I have to look out for? I am mainly concerned that using
> git-svn will re-introduce the merge issues of SVN the git is great at doing.--
I never tried merging of "SVN" branches. What I used to do is check-out
my local branch from tip of master (svn upstream), work on it. Before
"merging" changes upstream I rebased on top of upstream again, got a
fast-forward, and pushed to SVN.
If you used git-svn, why would you "merge"? As it does not support
"reverting" (at least I'm unaware of it), it's quite unnecessary IMHO
(put your merge commits upstream).
Motiejus
next prev parent reply other threads:[~2011-04-29 17:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-29 16:53 What Features Do I loose With git-svn? ryanzec
2011-04-29 17:16 ` Motiejus Jakštys [this message]
2011-04-30 23:08 ` Thomas Ferris Nicolaisen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110429171629.GA3394@jakstys.lt \
--to=desired.mta@gmail.com \
--cc=basire@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).