From: rupert THURNER <rupert.thurner@gmail.com>
To: git@vger.kernel.org
Subject: git svn push, git dcommit leads to commit duplication?
Date: Tue, 19 Jul 2011 21:55:23 +0200 [thread overview]
Message-ID: <CAJs9aZ8T+LSOGs-kdncfSJeLANtZqudwc0r-epV7BQ1t4huX9Q@mail.gmail.com> (raw)
we keep a svn clone of
https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg on
https://github.com/opencsw/pkg-all . usually i synchronize it with
"git svn rebase" and "git push" from a local clone created with "git
svn clone https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg".
last time i changed something in this local clone and pushed it to
github, and commited it to sourceforge via git svn dcommit. now the
commits are there two times, different. my guess was that dcommit
would add the svn related stuff to the existing git commits. what is
the correct usage to keep svn and git in sync?
$ git log origin/master..master
...
commit 38ed3e4dec877b356fbf3799d1419a89ce6d107f
Author: rthurner <rthurner@d3b55034-1cff-0310-a425-aefe953e1e90>
Date: Sun Jul 17 09:25:14 2011 +0000
libserf, obsolete devel, and not working 0-0 package
git-svn-id:
https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg@15081
d3b55034-1cff-0310-a425-aefe953e1e90
commit 22340c05f87b19bde70fd04016bee39e24bb6c8b
Author: rthurner <rthurner@d3b55034-1cff-0310-a425-aefe953e1e90>
Date: Sun Jul 17 09:24:53 2011 +0000
libserf, obsolete devel, and not working 0-0 package
git-svn-id:
https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg@15080
d3b55034-1cff-0310-a425-aefe953e1e90
$ git log master..origin/master
commit 25bf83cd73ad5ffb17a5bfb668ecdbde1b8971bd
Author: THURNER rupert <rupert@opencsw.org>
Date: Sun Jul 17 11:23:15 2011 +0200
libserf, obsolete devel, and not working 0-0 package
commit cd516e0f4a319ba2554ca29a911130b43b96f6ec
Author: THURNER rupert <rupert@opencsw.org>
Date: Sun Jul 17 11:21:36 2011 +0200
libserf, obsolete devel, and not working 0-0 package
next reply other threads:[~2011-07-19 19:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-19 19:55 rupert THURNER [this message]
2011-07-21 10:25 ` git svn push, git dcommit leads to commit duplication? Thomas Rast
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=CAJs9aZ8T+LSOGs-kdncfSJeLANtZqudwc0r-epV7BQ1t4huX9Q@mail.gmail.com \
--to=rupert.thurner@gmail.com \
--cc=git@vger.kernel.org \
/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).