Hello all, I am using git-svn and have some question

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Songmao Tian
Date: Saturday, January 6, 2007 - 2:24 am

(git v1.4.4.3)
I used the fantastic git-svn multi-init.
git-svn multi-init http://...

checkout a branch
git-checkout -b kkmao remotes/kkmao
git-checkout -b huahua remotes/huahua

git-pull . kkmao
(fix a conflict)

git-checkout kkmao

kkmao@Loongson:~/pmon/pmon-lm2e/git$ git-pull . huahua
Updating dee0161..3fa715b
Fast forward
 Targets/Bonito/conf/Bonito |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


finnally, "git-svn dcommit -i kkmao"failed, and got the following message

kkmao@Loongson:~/pmon/pmon-lm2e/git$ git-svn dcommit -i kkmao
diff-tree f179060aa2dd0a4ca4f95f2560ea708765a87a09~1
f179060aa2dd0a4ca4f95f2560ea708765a87a09
Merge conflict during commit: Your file or directory 'branches' is
probably out-of-date: The version resource does not correspond to the
resource within the transaction.  Either the requested version
resource is out of date (needs to be updated), or the requested
version resource is newer than the transaction root (restart the
commit). at /home/kkmao/bin/git-svn line 1577
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Hello all, I am using git-svn and have some question, Songmao Tian, (Sat Jan 6, 2:24 am)