[Assorted-commits] SF.net SVN: assorted:[1056] sandbox/trunk/src/git/gitsvn.bash

[<yan...@us...>]

Revision: 1056
          http://assorted.svn.sourceforge.net/assorted/?rev=1056&view=rev
Author:   yangzhang
Date:     2008-11-05 18:50:30 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
added some sample output; removed extraneous git svn rebase

Modified Paths:
--------------
    sandbox/trunk/src/git/gitsvn.bash

Modified: sandbox/trunk/src/git/gitsvn.bash
===================================================================
--- sandbox/trunk/src/git/gitsvn.bash	2008-11-05 18:45:41 UTC (rev 1055)
+++ sandbox/trunk/src/git/gitsvn.bash	2008-11-05 18:50:30 UTC (rev 1056)
@@ -32,16 +32,106 @@
 sed -i s/line1/Line1/ svn/myfile
 sed -i s/line4/Line4/ gitsvn/myfile
 svn ci -m 'munge line1' svn/
-(cd gitsvn; git commit -a -m 'munge line4'; git svn rebase)
+(cd gitsvn; git commit -a -m 'munge line4'; git svn rebase)  # XXX problem here
 
 # clone the git repo elsewhere and commit something there
 git clone file://$basedir/gitsvn gitsvn2
 sed -i s/line6/Line6/ gitsvn2/myfile
-(cd gitsvn2; git commit -a -m 'munge line6'; git svn rebase)
+(cd gitsvn2; git commit -a -m 'munge line6')
 
 # make concurrent change to svn
 sed -i s/line2/Line2/ svn/myfile
 svn ci -m 'munge line2' svn/
 
 # pull those changes back into the original git repo
-(cd gitsvn; git pull file://$basedir/gitsvn2; git svn rebase)
+(cd gitsvn; git pull file://$basedir/gitsvn2; git svn rebase)  # XXX problem here
+
+# Sample output:
+#
+# $ bash -x gitsvn.bash /tmp/test
+# + set -o errexit -o nounset
+# + basedir=/tmp/test
+# + mkdir -p /tmp/test
+# + cd /tmp/test
+# + mkdir svnrepo
+# + svnadmin create svnrepo
+# + svn co file:///tmp/test/svnrepo svn
+# Checked out revision 0.
+# + echo -e 'line1\nline2\nline3'
+# + svn add svn/myfile
+# A         svn/myfile
+# + svn ci -m 'added myfile' svn/
+# Adding         svn/myfile
+# Transmitting file data .
+# Committed revision 1.
+# + git svn clone file:///tmp/test/svnrepo gitsvn
+# Initialized empty Git repository in .git/
+# 	A	myfile
+# r1 = f9c96692b0244e1793f14de0cf6cb3d72efac32a (git-svn)
+# Checked out HEAD:
+#   file:///tmp/test/svnrepo r1
+# + echo -e 'line4\nline5\nline6'
+# + svn ci -m 'added more lines' svn/
+# Sending        svn/myfile
+# Transmitting file data .
+# Committed revision 2.
+# + cd gitsvn
+# + git svn rebase
+# 	M	myfile
+# r2 = 141185b6945d81b866db2258a902d5bdc5d6c8a4 (git-svn)
+# First, rewinding head to replay your work on top of it...
+# HEAD is now at 141185b... added more lines
+# Fast-forwarded master to refs/remotes/git-svn.
+# + sed -i s/line1/Line1/ svn/myfile
+# + sed -i s/line4/Line4/ gitsvn/myfile
+# + svn ci -m 'munge line1' svn/
+# Sending        svn/myfile
+# Transmitting file data .
+# Committed revision 3.
+# + cd gitsvn
+# + git commit -a -m 'munge line4'
+# Created commit 82a13bf: munge line4
+#  1 files changed, 1 insertions(+), 1 deletions(-)
+# + git svn rebase
+# 	M	myfile
+# r3 = 22e5d634f29dbfa70e4586a8d7e958e01489a8ff (git-svn)
+# First, rewinding head to replay your work on top of it...
+# HEAD is now at 22e5d63... munge line1
+# Applying munge line4
+# error: patch failed: myfile:1
+# error: myfile: patch does not apply
+# Using index info to reconstruct a base tree...
+# Falling back to patching base and 3-way merge...
+# Auto-merged myfile
+# + git clone file:///tmp/test/gitsvn gitsvn2
+# Initialized empty Git repository in /tmp/test/gitsvn2/.git/
+# + sed -i s/line6/Line6/ gitsvn2/myfile
+# + cd gitsvn2
+# + git commit -a -m 'munge line6'
+# Created commit 8f8a660: munge line6
+#  1 files changed, 1 insertions(+), 1 deletions(-)
+# + sed -i s/line2/Line2/ svn/myfile
+# + svn ci -m 'munge line2' svn/
+# Sending        svn/myfile
+# Transmitting file data .
+# Committed revision 4.
+# + cd gitsvn
+# + git pull file:///tmp/test/gitsvn2
+# remote: Counting objects: 5, done.
+# remote: Total 3 (delta 0), reused 0 (delta 0)
+# Updating fd0dc9b..8f8a660
+# Fast forward
+#  myfile |    2 +-
+#  1 files changed, 1 insertions(+), 1 deletions(-)
+# + git svn rebase
+# 	M	myfile
+# r4 = 22f9c8564ccbd4195c3c609c8149ef7bf33eec64 (git-svn)
+# First, rewinding head to replay your work on top of it...
+# HEAD is now at 22f9c85... munge line2
+# Applying munge line4
+# error: patch failed: myfile:1
+# error: myfile: patch does not apply
+# Using index info to reconstruct a base tree...
+# Falling back to patching base and 3-way merge...
+# Auto-merged myfile
+# Applying munge line6


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.