Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: [PATCH v2] git-svn: let 'dcommit $rev' work on $rev instead of HEAD

From: Eric Wong <hidden>
Date: 2016-06-15 22:46:54

Thomas Rast [off-list ref] wrote:
'git svn dcommit' takes an optional revision argument, but the meaning
of it was rather scary.  It completely ignored the current state of
the HEAD, only looking at the revisions between SVN and $rev.  If HEAD
was attached to $branch, the branch lost all commits $rev..$branch in
the process.

Considering that 'git svn dcommit HEAD^' has the intuitive meaning
"dcommit all changes on my branch except the last one", we change the
meaning of the revision argument.  git-svn temporarily checks out $rev
for its work, meaning that

* if a branch is specified, that branch (_not_ the HEAD) is rebased as
  part of the dcommit,

* if some other revision is specified, as in the example, all work
  happens on a detached HEAD and no branch is affected.

Signed-off-by: Thomas Rast <redacted>
Thanks.  Took me a while to remember why dcommit was was the way it
originally was and I couldn't remember for the life of me.

Acked and pushed out to git://git.bogomips.org/git-svn

-- 
Eric Wong
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help