[p4] (no subject)

Thu Jan 21 13:48:25 PST 2010

Apologies for not being clear, I was following on from the comment that was made to the p4blog. I would not *want* to integrate/submit the shelved files to the branch, but instead unshelve the files into the branch.

Reading the p4help you can unshelve into a different workspace but not into a branch. The latter would be useful if you want to move a pending changelist to your branch for further development.

...

Actually though, now that I think about it. The only reason I would be moving pending changelist to a branch would be because I want to check-in WIP without breaking the release line. That is completely unnecessary now that we can shelve. *epiphany*.

-----Original Message-----
From: perforce-user-bounces at perforce.com [mailto:perforce-user-bounces at perforce.com] On Behalf Of Matt Janulewicz
Sent: Friday, 22 January 2010 4:08 AM
To: perforce-user at perforce.com
Subject: Re: [p4] (no subject)

I'm not sure this would make sense in the Perforce World(tm). If you branch from a shelved file then abandon the changes, what would be the base of the branch? Your branch source has to exist first. For all intents and purposes, shelved files are transient until they become 'real' files and are submitted.

The script(s) mentioned below actually offload your files to a branch it creates on-the-fly, so it makes sense that you can branch from them.

-Matt

On 01/21/2010 04:01 AM, Dennis Roche wrote:

That would be very cool if you could use a shelved changelist as integration source.

Can anyone that has upgraded to 2009.2 confirm if this is possible?
________________________________________
From: perforce-user-bounces at perforce.com<mailto:perforce-user-bounces at perforce.com> [perforce-user-bounces at perforce.com<mailto:perforce-user-bounces at perforce.com>] On Behalf Of Robert Cowham [robert at vizim.com<mailto:robert at vizim.com>]
Sent: Thursday, 21 January 2010 9:00 PM
To: 'Nicolas Brault (2K Czech)'; 'Krzysztof Nosek'; perforce-user at perforce.com<mailto:perforce-user at perforce.com>
Subject: Re: [p4] (no subject)

A couple of pointers:

The new shelving option is described here:
http://blog.perforce.com/blog/?p=1872

Note the comment:

anders said on January 18th, 2010 at 9:03 pm:
Will it be possible to use a shelved changelist as a source for integration?
Use case: I start work on a bug fix in branch 1.0. Subsequently, the
decision is made to fix this in branch 2.0.
At this point, it would be really sweet to be able to shelve my change in
1.0 and integrate it into my 2.0 workspace.

This functionality has been around for a while in the form of scripts
written by users, for example:

http://public.perforce.com/wiki/P4_Shelve

> -----Original Message-----
> From: perforce-user-bounces at perforce.com<mailto:perforce-user-bounces at perforce.com>
> [mailto:perforce-user-bounces at perforce.com] On Behalf Of
> Nicolas Brault (2K Czech)
> Sent: 21 January 2010 10:43
> To: Krzysztof Nosek; perforce-user at perforce.com<mailto:perforce-user at perforce.com>
> Subject: Re: [p4] (no subject)
>
> Hi,
>
> Maybe this will help you
> http://kb.perforce.com/UserTasks/CodelinesAndBranching/Branchi
> ngWorkInPr
> ogress
>
>
> I used it few times, but I asked developers to branch before
> starting work.
>
> Regards,
> Nicolas
>
> > -----Original Message-----
> > From: perforce-user-bounces at perforce.com<mailto:perforce-user-bounces at perforce.com> [mailto:perforce-user-
> > bounces at perforce.com<mailto:bounces at perforce.com>] On Behalf Of Krzysztof Nosek
> > Sent: Thursday, January 21, 2010 10:10
> > To: perforce-user at perforce.com<mailto:perforce-user at perforce.com>
> > Subject: [p4] (no subject)
> >
> > Hello group,
> >
> >
> > I'm relatively new to Perforce with considerable Subversion
> background,
> > and perhaps that's why I have big problem with establishing
> the proper
> > way of switching users to a branch, every single time we do branch.
> > Which is why, I'm afraid, that in predictably short future
> we may stop
> > branching.
> >
> > I consider the simplest use case: a developer who works in
> main code
> > line and has some changelists pending; now we want to move all her
> > development to a branch which has just been created.
> >
> > Does she:
> > a) create new "branch" workspace, basing on her "main" one, and
> > populate it with fresh files? or
> > b) extend her "main" workspace to include the branch and update it
> with
> > branched files? or
> > c) modify her "main" workspace to refer to the branch
> rather than to
> > main, and then update it? (or doesn't? is it safe?) And what will
> > happen with her check-outs then?
> > Of course I mean that she wants to continue working on the
> checked-out
> > files and possibly submit them to the branch (or she wants
> to work on
> > them even longer, switch back to main and then submit to main code
> > line, whatever).
> >
> > So far we've painfully learned the following rules:
> > 1) submit or revert *all* your pending changes before switching :(
> > 2) fetch the whole branch anew using methods a) or b) and start
> working
> > there from the beginning :((
> > 3) if you didn't manage to organize your changes according to 1),
> > check-out relevant files by hand in the branch localization and
> > overwrite them using your "main" copies (therefore duplicating all
> your
> > pending changes) :(((
> >
> > It's _not_ user-efficient nor safe, oh no. I believe there must be
> > better ways.
> >
> > Please help. Sorry if it was explained many times on this
> or another
> > forum; and not that I'm going to blame the p4 docs issue for their
> > scarcity on the topic. Maybe I just wasn't looking at the
> right place.
> >
> > Thank you,
> >
> > Krzysztof Nosek
> > Techland
> >
> >
> ----------------------------------------------------------------------
> > Codziennie 11 tys. ofert pracy
> > Sprawdz >>> http://link.interia.pl/f2579
> >
> > _______________________________________________
> > perforce-user mailing list  -  perforce-user at perforce.com<mailto:perforce-user at perforce.com>
> > http://maillist.perforce.com/mailman/listinfo/perforce-user
>
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com<mailto:perforce-user at perforce.com>
> http://maillist.perforce.com/mailman/listinfo/perforce-user
_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com<mailto:perforce-user at perforce.com>
http://maillist.perforce.com/mailman/listinfo/perforce-user

This message and its attachments may contain legally privileged or confidential information. This message is intended for the use of the individual or entity to which it is addressed. If you are not the addressee indicated in this message, or the employee or agent responsible for delivering the message to the intended recipient, you may not copy or deliver this message or its attachments to anyone. Rather, you should permanently delete this message and its attachments and kindly notify the sender by reply e-mail. Any content of this message and its attachments, which does not relate to the official business of the sending company must be taken not to have been sent or endorsed by the sending company or any of its related entities. No warranty is made that the e-mail or attachment(s) are free from computer virus or other defect.

_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com<mailto:perforce-user at perforce.com>
http://maillist.perforce.com/mailman/listinfo/perforce-user
_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user

This message and its attachments may contain legally privileged or confidential information. This message is intended for the use of the individual or entity to which it is addressed. If you are not the addressee indicated in this message, or the employee or agent responsible for delivering the message to the intended recipient, you may not copy or deliver this message or its attachments to anyone. Rather, you should permanently delete this message and its attachments and kindly notify the sender by reply e-mail. Any content of this message and its attachments, which does not relate to the official business of the sending company must be taken not to have been sent or endorsed by the sending company or any of its related entities. No warranty is made that the e-mail or attachment(s) are free from computer virus or other defect.