Re: git svn branch tracking + ignore paths

From: Avery Pennarun <apenwarr@gmail.com>
Date: Oct 28, 2009, 05:20 UTC
Message-ID: <32541b130910272220p59482397wef0d51b1adf1a5bd@mail.gmail.com>
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:

Show 7 quoted lines

> :) 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