[p4] perforce-user Digest, Vol 34, Issue 17
James Fang
james.fang at 2kgames.cn
Sun Oct 21 04:08:38 PDT 2007
Thanks
James Fang
----- Original Message -----
From: perforce-user-bounces at perforce.com <perforce-user-bounces at perforce.com>
To: perforce-user at perforce.com <perforce-user at perforce.com>
Sent: Sun Oct 21 03:00:16 2007
Subject: perforce-user Digest, Vol 34, Issue 17
Send perforce-user mailing list submissions to
perforce-user at perforce.com
To subscribe or unsubscribe via the World Wide Web, visit
http://maillist.perforce.com/mailman/listinfo/perforce-user
or, via email, send a message with subject or body 'help' to
perforce-user-request at perforce.com
You can reach the person managing the list at
perforce-user-owner at perforce.com
When replying, please edit your Subject line so it is more specific
than "Re: Contents of perforce-user digest..."
Today's Topics:
1. Question about branching. (Steven W. Orr)
2. Re: Question about branching. (Stephen Vance)
3. Re: Question about branching. (Jeff A. Bowles)
----------------------------------------------------------------------
Message: 1
Date: Fri, 19 Oct 2007 16:37:47 -0400 (EDT)
From: "Steven W. Orr" <steveo at syslang.net>
Subject: [p4] Question about branching.
To: Perforce Users <perforce-user at perforce.com>
Message-ID: <alpine.LFD.0.9999.0710181342220.29239 at saturn.syslang.net>
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
I made a mistake when I went to rename a file. What I did was to
p4 integrate oldname newname
p4 delete oldname
Then I modified newname, not realizing that newname was not opened for
editing. The expected result was that the submit didn't contain any of my
changes.
Is there a way to modify a file after an integrate before a submit?
TIA
--
Time flies like the wind. Fruit flies like a banana. Stranger things have .0.
happened but none stranger than this. Does your driver's license say Organ ..0
Donor?Black holes are where God divided by zero. Listen to me! We are all- 000
individuals! What if this weren't a hypothetical question?
steveo at syslang.net
------------------------------
Message: 2
Date: Sat, 20 Oct 2007 07:28:59 +1000
From: Stephen Vance <steve at vance.com>
Subject: Re: [p4] Question about branching.
To: "Steven W. Orr" <steveo at syslang.net>
Cc: Perforce Users <perforce-user at perforce.com>
Message-ID: <4719219B.1020301 at vance.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
You just need to do a 'p4 edit' on it.
Steve
Steven W. Orr wrote:
> I made a mistake when I went to rename a file. What I did was to
>
> p4 integrate oldname newname
> p4 delete oldname
>
> Then I modified newname, not realizing that newname was not opened for
> editing. The expected result was that the submit didn't contain any of my
> changes.
>
> Is there a way to modify a file after an integrate before a submit?
>
> TIA
>
>
--
Stephen Vance
www.vance.com
------------------------------
Message: 3
Date: Sat, 20 Oct 2007 12:01:11 +0200
From: "Jeff A. Bowles" <jab at pobox.com>
Subject: Re: [p4] Question about branching.
To: "Stephen Vance" <steve at vance.com>, "Steven W. Orr"
<steveo at syslang.net>
Cc: Perforce Users <perforce-user at perforce.com>
Message-ID:
<9b8625810710200301h1b574e18s4a8dc04a634250b0 at mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
One additional comment: the situation is very close to a common
situation that a Java developer might encounter....
"I have x.java that defines class 'x' and want to copy it to
y.java to create a class 'y'. My Perforce-folks encourage me to use
an 'integrate/submit' so that it is clear that I made a copy of x.java
to start from, but I need to change the class or package statement
before I submit it, so that revision #1 of the new file is immediately
usable."
Steve's response remains perfect for that situation also: integ / edit / submit.
-Jeff
On 10/19/07, Stephen Vance <steve at vance.com> wrote:
> You just need to do a 'p4 edit' on it.
>
> Steve
>
> Steven W. Orr wrote:
> > I made a mistake when I went to rename a file. What I did was to
> >
> > p4 integrate oldname newname
> > p4 delete oldname
> >
> > Then I modified newname, not realizing that newname was not opened for
> > editing. The expected result was that the submit didn't contain any of my
> > changes.
> >
> > Is there a way to modify a file after an integrate before a submit?
> >
> > TIA
> >
> >
>
> --
> Stephen Vance
> www.vance.com
> _______________________________________________
> perforce-user mailing list - perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>
--
---
Jeff Bowles - jeff.a.bowles at gmail.com
------------------------------
_______________________________________________
perforce-user mailing list - perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user
End of perforce-user Digest, Vol 34, Issue 17
*********************************************
More information about the perforce-user
mailing list