Re: Re: SVN checkout from branch...Failing
From: Aneesh K raj <neptune_pluto_at_rediffmail.com>
Date: 23 Feb 2008 08:26:13 -0000
Hi Ryan,
In my ant build script,
i have 2 targets...i have included the same...in a concise way
Target 1 :
<target checkoutFromTrunk>
svn checkout http://svn.example.com/repo/trunk wc
</target>
Target 2 :
<target checkoutFromBranch>
svn switch http://svn.example.com/repo/branches/somebranch/somedir wc/somedir
</target>
User 1 executes checkoutFromTrunk target,
it fetches...all code from trunk....
Now User 1 executes checkoutFromBranch target,
it gets code related to one folder(somedir)...to the local.
(i.e. updates this directory code from the branch).
So far so good..
Now if user2 tries to executes checkoutFromTrunk,
he gets updated code from trunk...except for this one folder(somedir)
My doubt was...when he executes checkoutFromTrunk, cant we
get all the code from trunk including that of the folder(somedir)???
Regards
On Fri, 22 Feb 2008 Ryan Schmidt wrote :
>On Feb 21, 2008, at 12:56, Aneesh K raj wrote:
>
>>On Sat, 02 Feb 2008 Ryan Schmidt wrote :
>>
>> >On Feb 2, 2008, at 00:53, Aneesh K raj wrote:
>> >
>> >>I have a target where i get src files from a particular trunk
>> >>
>> >>and then from that files...i hv to override one of the folders with src files from a different branch
>> >>
>> >>
>> >>i tried and it says that the the existing folder has a diff url.
>> >>and it fails...
>> >>
>> >>
>> >>So Hw to go abt it...
>> >>
>> >
>> >You didn't show us the commands you used or the exact error message you got, so it's difficult to guess. But I think I can help you. If I understand correctly, you want a working copy where most of the files are from the trunk, but one directory of files comes from a branch? That can be done like this:
>> >
>> >svn checkout http://svn.example.com/repo/trunk wc
>> >
>> >svn switch \
>> >http://svn.example.com/repo/branches/somebranch/somedir \
>> >wc/somedir
>>
>> suppose i execute the target....in the below way...
>>
>>User1 (combination of both trunk & branch)
>>
>> checkout from trunk....
>>
>> checkout from branch(1 folder belonging to user1)
>>
>>User 2
>>
>> checkout from trunk....only...
>>
>>User 1 executes and runs the 2 targets...successfully
>>
>>but now when user2 wants to execute target to checkout from trunk only..
>>
>> all the code comes from trunk (except the 1 folder of branch)
>>
>>
>>How can we avoid this situation...so that all the code including that 1 folder will have the code from the trunk...
>>
>
>I don't know what you mean by "execute the target". I'm having a hard time picturing what you're doing or how you want it to work.
>
>
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.