[clug] Git help please - I might be breaking branches

[Alex Satrapa]

On 23/03/2009, at 13:49 , Daniel Pittman wrote:

> That will fetch changes automatically, but only for the current branch
> parent in SVN,

That's all I want to achieve - svn-trunk in my git repository is the  
branch that I'm keeping in sync with the Subversion repository.

> Yes, it is both safe and the recommend 'git svn' practice to work in
> this way: the upstream author recommends using dcommit and rebase to
> merge upstream changes rather than git merge.

I get stuff from Subversion to svn-trunk, then locally branch to  
"ticket-123", work locally to resolve the ticket, then locally merge  
back to the git branch named "svn-trunk". These are not upstream  
changes, these are changes i end up pushing back to the upstream using  
dcommit. Any changes that happen upstream are taken into account  
during my subversion dance steps of fetch/rebase.

> This is the logical fallout from that, where there is a slight  
> mismatch
> between the git branch model, the svn branch model and the git svn
> branch model.

There are no Subversion branches other than Trunk involved in these  
operations.

Thus the "git checkout -b ticket-123" which has absolutely no effect  
on Subversion. Don't let the name "svn-trunk" fool you - all this work  
is happening locally in my git-controlled environment.

Alex

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 220 bytes
Desc: This is a digitally signed message part
Url : http://lists.samba.org/archive/linux/attachments/20090323/0ca37262/PGP.bin