Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-25 Thread Eric Wong
Robert Luberda wrote: > Eric Wong wrote: > > Oops, I'll push the following out since Junio already merged your > > original: > > I can see that you haven't pushed the change yet. Maybe it would be a > good idea to fix other style mistakes (extra spaces after redirections, > lack of spaces after

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-24 Thread Robert Luberda
Eric Wong wrote: Hi, > > Oops, I'll push the following out since Junio already merged your > original: I can see that you haven't pushed the change yet. Maybe it would be a good idea to fix other style mistakes (extra spaces after redirections, lack of spaces after function names, `[' used ins

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-21 Thread Eric Wong
Robert Luberda wrote: > While working on my next patch, I've accidentally discovered that bash gives > the following errors in the test file introduced in my commit : > > ./t9164-git-svn-dcommit-concrrent.sh: line 65: $hook: ambiguous redirect > ./t9164-git-svn-dcommit-concrrent.sh: line 66: $hoo

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-19 Thread Junio C Hamano
Robert Luberda writes: > Eric Wong wrote: > > Hi, > >> Junio C Hamano wrote: >>> I should have asked this yesterday, but do you mean you want to have >>> your "maint" in the upcoming 1.7.12? This does look like a useful >>> thing to do, but does not seem like a regression fix to me. >> >> Yeah

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-19 Thread Robert Luberda
Eric Wong wrote: Hi, > Junio C Hamano wrote: >> I should have asked this yesterday, but do you mean you want to have >> your "maint" in the upcoming 1.7.12? This does look like a useful >> thing to do, but does not seem like a regression fix to me. > > Yeah, I wasn't sure what to name it since

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-10 Thread Eric Wong
Junio C Hamano wrote: > I should have asked this yesterday, but do you mean you want to have > your "maint" in the upcoming 1.7.12? This does look like a useful > thing to do, but does not seem like a regression fix to me. Yeah, I wasn't sure what to name it since my master is still carrying Mic

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-09 Thread Junio C Hamano
Eric Wong writes: > Robert Luberda wrote: >> Eric Wong wrote: >> >> + echo "PATH=\"$PATH\"; export PATH" >> $hook >> >> + echo "svnconf=\"$svnconf\"" >> $hook >> >> + cat >> "$hook" <<- 'EOF2' >> >> + cd work-auto-commits.svn >> >> + svn up

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-08 Thread Eric Wong
Robert Luberda wrote: > Eric Wong wrote: > >> + echo "PATH=\"$PATH\"; export PATH" >> $hook > >> + echo "svnconf=\"$svnconf\"" >> $hook > >> + cat >> "$hook" <<- 'EOF2' > >> + cd work-auto-commits.svn > >> + svn up --config-dir "$svnconf

[PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-07 Thread Robert Luberda
dcommit didn't handle errors returned by SVN and coped very poorly with concurrent commits that appear in SVN repository while dcommit was running. In both cases it left git repository in inconsistent state: index (which was reset with `git reset --mixed' after a successful commit to SVN) no longer

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-07 Thread Robert Luberda
Eric Wong wrote: Hi, > > A few minor comments inline... > Please ensure all error messages and code are readable in > 80-column terminals. > Also, keep opening "{" on the same line as the if/unless. > Backticks don't nest properly, nowadays, we prefer: > N=$(expr $N + 1) >> +cp

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-02 Thread Eric Wong
Robert Luberda wrote: > dcommit didn't handle errors returned by SVN and coped very > poorly with concurrent commits that appear in SVN repository > while dcommit was running. In both cases it left git repository > in inconsistent state: index (which was reset with `git reset > --mixed' after a su

[PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-01 Thread Robert Luberda
dcommit didn't handle errors returned by SVN and coped very poorly with concurrent commits that appear in SVN repository while dcommit was running. In both cases it left git repository in inconsistent state: index (which was reset with `git reset --mixed' after a successful commit to SVN) no longer