git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexander Litvinov <litvinov2004@gmail.com>
To: Sam Vilain <sam@vilain.net>
Cc: Patrick Doyle <wpdster@gmail.com>, git@vger.kernel.org
Subject: Re: git for subversion users
Date: Tue, 26 Jun 2007 13:02:09 +0700	[thread overview]
Message-ID: <200706261302.10056.litvinov2004@gmail.com> (raw)
In-Reply-To: <46809733.2060200@vilain.net>

В сообщении от 26 июня 2007 11:33 Sam Vilain написал(a):
> There's your first issue - misunderstanding branching :)  You should end
> up realising that every little idea or feature forms a code branch in
> the direction of its implementation, the choice is whether to let the
> branches twist and grow together or train them in clear directions.

git-svn has one major trouble with branch handling: merge two branches that 
are different branches at svn. Or simply start from different point from svn 
branch.

git-svn dcommit operation tries to figure out where to commit at svn side and 
fail at these conditions. It seems to me this happend becuse it uses special 
line at git's commit comment and in case of such merge it does not know there 
to commit. I did not found how to deal with this situation.

So, git-svn just a offline-capable version of svn client with linear history. 
Sure. you can fork your own branch and then merge it into svn branch again 
but you should really careful about this.

I even does not know the way to solve this problem.

---
Alexander Litvinov.

  parent reply	other threads:[~2007-06-26  6:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-25 19:48 git for subversion users Patrick Doyle
2007-06-26  4:33 ` Sam Vilain
2007-06-26  5:25   ` Steven Grimm
2007-06-26  5:54     ` Sam Vilain
2007-06-26  7:29       ` Sam Vilain
2007-06-26 13:19         ` Patrick Doyle
2007-06-26  6:02   ` Alexander Litvinov [this message]
2007-06-26  7:48     ` subversion and merging [was: Re: git for subversion users] Sam Vilain

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=200706261302.10056.litvinov2004@gmail.com \
    --to=litvinov2004@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=sam@vilain.net \
    --cc=wpdster@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).