Kohsuke,
Thanks. What's confusing to me is that the verb "switch" means "to
exchange or replace something with another". From what I understand,
that's NOT what it does; it also merges in changes in the local code.
It's more accurately termed "switch-merge-existing".
That merging behavior makes it a non-starter for selective changes,
since I'll have changes on my local copy of the trunk that I do not
want to commit to TP2.
So it seems to me that the tried-and-true habit of maintaining two
distinct copies of the source tree--one for TP2 and one for the trunk--
would allow a real switch in the proper meaning of the verb.
To check out TP2 with cvs, I would have done:
cvs co -r TAG_NAME ...
cvs update -j <selective files I want>
I'm still not clear on how to do this in 'svn'. I'll go read the
manual today. Here is my naive attempt to get a fresh TP2:
MB2:temp lloyd$ svn co
https://svn.dev.java.net/glassfish-svn/branches/tp2
svn: PROPFIND request failed on '/glassfish-svn/branches/tp2'
svn: PROPFIND of '/glassfish-svn/branches/tp2': 501 Method PROPFIND is
not defined in RFC 2068 and is not supported by the Servlet API (
https://svn.dev.java.net
)
Lloyd
On Apr 18, 2008, at 11:32 AM, Kohsuke Kawaguchi wrote:
> Lloyd L Chambers wrote:
>> What happens if you do a switch when you have uncommitted code?
>> Does it preserve it somehow? (Makes me a little nervous!)
>
> It's essentially the same as "cvs up -r branch". It will try to take
> your diff and apply that to the branch you are moving to. There are
> some gotchas, like when the files in question has been moved
> elsewhere in a branch, but in general, it doesn't lose the changes.
>
>
>
>> On Apr 18, 2008, at 9:53 AM, Kedar Mhaswade wrote:
>>> Kohsuke Kawaguchi wrote:
>>>> Still some more work is left, but the branch is open for code
>>>> changes, as long as you have approvals to commit changes to the
>>>> branch.
>>>> Hudson jobs are set up on the TP2 branch. They are glassfish-v3-
>>>> tp2, glassfish-v3-tp2-devbuild, and v3-tp2-quicklook, and they
>>>> work in the same way as their corresponding trunk counterparts
>>>> work. I haven't yet verified if the builds run through on
>>>> Hudson, so expect several more failures before Hudson builds get
>>>> sorted out.
>>>> Eventually we will merge back this branch into trunk, and we'd
>>>> like to keep the merge simple. So to this end, it would be good
>>>> if people can hold off changes that involve directory moves as
>>>> much as possible.
>>>> For those of you that need to work on the branch, you can switch
>>>> your workspace between branch and trunk by using "svn switch", like
>>>> cd v3
>>>> svn switch https://svn.dev.java.net/glassfish-svn/branches/tp2
>>>> (note that svn.dev.java.net needs to be adjusted depending on
>>>> which domain name you used to check out the workspace)
>>>
>>> Is this command enough, or after you switch, you need to "svn
>>> update"?
>>>
>>> Also, to switch to trunk it should be .../trunk, right?
>>>
>>>> Let me know if you see any issues.
>>>> Kohsuke Kawaguchi wrote:
>>>>> Jerome Dochez wrote:
>>>>>> We are still in the process of creating the branch and
>>>>>> related infrastructure items like versions and hudson jobs so
>>>>>> the workspace is still closed for major checkins.
>>>>>>
>>>>>> Kohuske will send a note when this will be ready with
>>>>>> instructions, look for an email from him.
>>>>>
>>>>> The branch creation work is still in progress --- mainly because
>>>>> I am changing the workspace so that we can run the Maven
>>>>> release plugin on it. Much of this is one time work, which we
>>>>> won't have to do in future branching.
>>>>>
>>>>>
>>>>> Most of the changes are in the POM file, and in particular how
>>>>> they are versioned and how the other components depend on them.
>>>>> Most notably, I moved the v3/api/ to api/ to reflect how they
>>>>> are built.
>>>>>
>>>>>
>>>>> While the work is still in progress, the v3/ trunk is open for
>>>>> code changes. It's just that if you need to modify POM, I'd
>>>>> like to get informed so that we won't have too much headache
>>>>> down the road when trying to merge the branch back into the
>>>>> trunk.
>>>>>
>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
>>> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>>>
>> ---
>> Lloyd L Chambers
>> lloyd.chambers_at_sun.com
>> Sun Microsystems, Inc
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
>> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>
>
> --
> Kohsuke Kawaguchi
> Sun Microsystems kohsuke.kawaguchi_at_sun.com
---
Lloyd L Chambers
lloyd.chambers_at_sun.com
Sun Microsystems, Inc