git svn push, git dcommit leads to commit duplication?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxx>
Date:   Sun Jul 17 11:23:15 2011 +0200

    libserf, obsolete devel, and not working 0-0 package

commit cd516e0f4a319ba2554ca29a911130b43b96f6ec
Author: THURNER rupert <rupert@xxxxxxxxxxx>
Date:   Sun Jul 17 11:21:36 2011 +0200

    libserf, obsolete devel, and not working 0-0 package
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]