From: "Imran M Yousuf" <imyousuf@gmail.com>
To: "João Abecasis" <joao@abecasis.name>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: git-svn condenses history when dcommit is interrupted
Date: Sat, 17 May 2008 10:35:06 +0600 [thread overview]
Message-ID: <7bfdc29a0805162135m2758171dva6a6594239733bd8@mail.gmail.com> (raw)
In-Reply-To: <7bf6f1d20805161402m4fa473f5w198bc8cb055eb95f@mail.gmail.com>
>> Whenever my commit is not completed successfully I can thus easily
>> reset, rebase and follow the command sequence again. This way I have
I forgot to mention 'git svn fetch' if the commit succeeds and the update fails
> But that doesn't help with the problem I have faced, which is when
> dcommit fails *after* some change has already been committed to the
> subversion repository. At that point, the local copy of the subversion
Did you try 'git svn fetch' at this point
> history is broken since git thinks it has got the fetched the
> committed revision but it's not in the history.
> ....
> I think this is a bug with git-svn that should be fixed and I will
> gladly help fix it in any way I can. Do you think I should be more
> explicit and focus on the broken history instead of the "condensed
> merges"?
It could be a bug but I am not sure, what I am sure of is that I faced
a *similar* (not sure identical) problem and 'git reset' and 'git svn
fetch' followed by rebase, merge and dcommit was successful in my
case.
Best regards,
--
Imran M Yousuf
Email: imran@smartitengineering.com
Mobile: +880-1711402557
prev parent reply other threads:[~2008-05-17 4:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-15 9:06 git-svn condenses history when dcommit is interrupted João Abecasis
[not found] ` <7bfdc29a0805150224j30db42d5te1f386efee0ff7a0@mail.gmail.com>
[not found] ` <7bf6f1d20805161402m4fa473f5w198bc8cb055eb95f@mail.gmail.com>
2008-05-17 4:35 ` Imran M Yousuf [this message]
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=7bfdc29a0805162135m2758171dva6a6594239733bd8@mail.gmail.com \
--to=imyousuf@gmail.com \
--cc=git@vger.kernel.org \
--cc=joao@abecasis.name \
/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).