[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

multi ancestors (multi-headed) problem

From: Yang, Yafei <yafeiy_at_qualcomm.com>
Date: Fri, 6 Feb 2009 16:35:08 -0800

Dear SVN authors,

I am using SVN and importing some data from Perforce. In Perforce, I have some nodes which have three ancestors (called 3-headed monster). I am wondering whether there are the similar cases in SVN. In perforce, if you use the following procedure, you can create the 3-headed monsters. Could we implement it in SVN?

>> echo asdf > foo

>> p4 add foo

>> p4 submit -d foo

>>

>> p4 integ foo bar

>> p4 submit -d foo

>>

>> p4 edit foo

>> echo sadf >> foo

>> p4 submit -d foo

>>

>> p4 edit foo

>> echo sadf >> foo

>> p4 submit -d foo

>>

>> p4 edit foo

>> echo sadf >> foo

>> p4 submit -d foo

>>

>> p4 integ foo#2 bar

>> p4 integ foo#3 bar

>> p4 integ foo#4 bar

>> p4 resolve -am

>> p4 submit -d foo

>>

>>And then run "p4 filelog" on bar file at the command prompt.

>>

>> $ p4 filelog bar

>> //depot/integ_test/bar

>> ... #2 change 1055 integrate on 2009/01/05 by yafeiy (text) 'foo'

>> ... ... copy from //depot/integ_test/foo#4

>> ... ... merge from //depot/integ_test/foo#3

>> ... ... merge from //depot/integ_test/foo#2

>> ... #1 change 1051 branch on 2009/01/05 by yafeiy (text) 'foo'

>> ... ... branch from //depot/integ_test/foo#1

Thank you very much for your helping!

Best regards,

Yafei

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1115560

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-07 01:44:04 CET

This is an archived mail posted to the Subversion Users mailing list.