Re: [PATCH] prohibit "svn dcommit" on remote-tracking-branches

From: Christian Engwer <christian.engwer@wwu.de>
Date: Apr 15, 2012, 13:40 UTC
Message-ID: <20120415134051.GA16786@mathe-macht-spass.de>
In-Reply-To: <20120410211732.GB27555@dcvr.yhbt.net>

Hi,

we had a litte discussion on this topic in the debian bug-tracker:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667488

Show 8 quoted lines

> > A branch should either be a local copy of an svn branch, or a remote
> > tracking branch. After a "git svn dcommit" a remote tracking branch
> > could not be synced with the git remote due to the rebase that occured
> > during the dcommit. Thus we check for a remote entry in the git config
> > for the current branch and prohibit the "dcommit" if such an entry
> > exists.
> 
> Should there be an option to force/override this?

The suggestion was implement this as a hook, instead of being the default behavior. An other option is to use the proposed syntax and allow an explicit overwrite by setting the commiturl, or to add a completely new option, in order to avoid confusion.

Opinions?

Show 13 quoted lines

> git-svn predates remote tracking branches, and I've never gotten in the
> habit using remote tracking branches.  I'll wait for others to chime
> in...
> 
> > +        if (s/^\* +//)
> > +        {
> 
> style, opening brace should be on the same line as the if/while/for:
> 
> 	if (...) {
> 
> Also, indentation should be with hard tabs.  (Basically follow existing
> style conventions when you see them).  Thanks.

I'll update the patch.

Cheers Christian