* git svn dcommit with a dirty index
@ 2007-11-07 19:06 Benoit Sigoure
2007-11-11 1:42 ` Eric Wong
0 siblings, 1 reply; 2+ messages in thread
From: Benoit Sigoure @ 2007-11-07 19:06 UTC (permalink / raw)
To: git list; +Cc: Eric Wong
[-- Attachment #1: Type: text/plain, Size: 1294 bytes --]
Hello list,
From what I understand, when using dcommit, git-svn uses rebase to
"sync" the history with what has just been committed. If the index
is in a dirty state, this will cause trouble. I thought about using
git-stash and then git stash apply --index but I'm afraid this could
be confusing if dcommit actually brings more revision in that the
ones it has just committed. I'm not sure this is possible and even
if it is, it might not be troublesome since if the commits are
accepted in the SVN repo, they surely don't overlap with commits that
have been sent in the mean time. But it's risky, so I don't know
what to do. If we use the stash approach, we might want to tell the
user that we bailed out because of a problem that needs to be fixed
and that he can recover his changes with git stash apply --index.
Or we should simply check that the index isn't dirty beforehand and
refuse to dcommit if it is.
Any suggestion?
PS OT: Eric, have you made any progress on the svn:externals<-
>submodules mapping? I badly need this feature, but I don't want to
start to work on it if you're currently working on it (or about to
deal with it) to avoid unecessary effort duplication.
--
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 186 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: git svn dcommit with a dirty index
2007-11-07 19:06 git svn dcommit with a dirty index Benoit Sigoure
@ 2007-11-11 1:42 ` Eric Wong
0 siblings, 0 replies; 2+ messages in thread
From: Eric Wong @ 2007-11-11 1:42 UTC (permalink / raw)
To: Benoit Sigoure; +Cc: git list
Benoit Sigoure <tsuna@lrde.epita.fr> wrote:
> Hello list,
> From what I understand, when using dcommit, git-svn uses rebase to
> "sync" the history with what has just been committed. If the index
> is in a dirty state, this will cause trouble. I thought about using
> git-stash and then git stash apply --index but I'm afraid this could
> be confusing if dcommit actually brings more revision in that the
> ones it has just committed. I'm not sure this is possible and even
> if it is, it might not be troublesome since if the commits are
> accepted in the SVN repo, they surely don't overlap with commits that
> have been sent in the mean time. But it's risky, so I don't know
> what to do. If we use the stash approach, we might want to tell the
> user that we bailed out because of a problem that needs to be fixed
> and that he can recover his changes with git stash apply --index.
>
> Or we should simply check that the index isn't dirty beforehand and
> refuse to dcommit if it is.
>
> Any suggestion?
The latter option is much simpler. I actually thought there was already
a check in dcommit that prevents it from committing with a dirty index,
but apparently not...
> PS OT: Eric, have you made any progress on the svn:externals<-
> >submodules mapping? I badly need this feature, but I don't want to
> start to work on it if you're currently working on it (or about to
> deal with it) to avoid unecessary effort duplication.
Oops, sorry. I've been busy and forgetful. I'll try to work on it
later tonight or tomorrow.
--
Eric Wong
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-11-11 1:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-07 19:06 git svn dcommit with a dirty index Benoit Sigoure
2007-11-11 1:42 ` Eric Wong
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).