From: Avery Pennarun <apenwarr@gmail.com>
To: Lachlan Deck <lachlan.deck@gmail.com>
Cc: git list <git@vger.kernel.org>
Subject: Re: git svn branch tracking + ignore paths
Date: Wed, 28 Oct 2009 01:20:32 -0400 [thread overview]
Message-ID: <32541b130910272220p59482397wef0d51b1adf1a5bd@mail.gmail.com> (raw)
In-Reply-To: <AC7B0CB1-1B14-4EAE-A6B6-D0845EACE626@gmail.com>
On Tue, Oct 27, 2009 at 11:00 PM, Lachlan Deck <lachlan.deck@gmail.com> wrote:
> :) Sure. Essentially a project that I'm contributing to has both maven poms
> and ant/lib-based configs (with the ant ones as default for eclipse .project
> etc files). I'd like to be able to import the projects with maven into
> Eclipse to work on things but without committing back changes to eclipse
> .project/.classpath/.settings/*.
>
> So I'm hoping for a fairly transparent process.
So which are the files you don't want to import from trunk? It
doesn't sound like there are any... so it's getting simpler already.
Also, can you just simply not commit any changes to the other files?
That would be the easiest way to deal with committing back. The other
option (slightly messier) is to change them in a single commit, and
use git rebase to move that commit out of the way when you're about to
push your changes back into svn.
Have fun,
Avery
next prev parent reply other threads:[~2009-10-28 5:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-27 23:00 git svn branch tracking + ignore paths Lachlan Deck
2009-10-27 23:16 ` Avery Pennarun
2009-10-28 3:00 ` Lachlan Deck
2009-10-28 5:20 ` Avery Pennarun [this message]
2009-10-28 5:59 ` Lachlan Deck
2009-10-28 16:00 ` Avery Pennarun
2009-10-29 1:53 ` Lachlan Deck
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=32541b130910272220p59482397wef0d51b1adf1a5bd@mail.gmail.com \
--to=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=lachlan.deck@gmail.com \
/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).