[p4] Sync question

Jim Walnum JWalnum at axarosenberg.com
Wed Aug 19 10:57:10 PDT 2009


I'm a relative noob with Perforce, and I have recently inherited the job
as admin. A user has asked me about an apparent problem they are having
with a sync to a changelist ID. They run:

C:\>p4 -s -u user1 -p perforce:1666 -c shadow_local_machine1 sync
//depot/dir1/... at 140752

And get:

error: //depot/dir1/... at 140752 - file(s) up-to-date.
exit: 0

But when they run a change report they see the client only has change
140650 (earlier than the 140752 change)

C:\>p4 changes -m 1 -t -l //depot/dir1/...@/... at shadow_local_machine1

Change 140650 on 2009/08/04 17:06:10 by user1 at shadow_local_machine2

Am I missing something obvious?

Thanks, 

- Jim W
 


-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of
perforce-user-request at perforce.com
Sent: Tuesday, August 11, 2009 12:00 PM
To: perforce-user at perforce.com
Subject: perforce-user Digest, Vol 56, Issue 10

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. Re: print? (Charles Summey)
   2. Propagating changes from branch to branch (Jason Perry)
   3. Copying files and metadata from one server to another
      (Pankaj Goyal)
   4. Re: Integration preview (Stephen Vance)
   5. Re: Copying files and metadata from one server to another
      (Stephen Vance)
   6. Re: Copying files and metadata from one server to another
      (Tim McDaniel)
   7. Re: Propagating changes from branch to branch (Rick Macdonald)
   8. Hugo Lamelas/CEG/CSC is out of the office. (Hugo Lamelas)
   9. Re: Modifying Changelist form (Ivey, William)


----------------------------------------------------------------------

Message: 1
Date: Mon, 10 Aug 2009 15:31:51 -0400
From: Charles Summey <charles.summey at vgt.net>
To: "perforce-user at perforce.com" <perforce-user at perforce.com>
Subject: Re: [p4] print?
Message-ID: <0250C230D4293940865ECA23E708A7871102F8AB94 at ExMB.vgt.net>
Content-Type: text/plain; charset="us-ascii"

let me slightly update my request.

I still use P4Win,
when P4Win in opened, in the "Client View of Depot" pane, I might have
any number of folders open exposing files,
I tried to right click in the pane hoping to select "print" 
in order to get a hardcopy of the folder contents as shown in the pane,

I have also tried to look in the drop down menus for a print option,
don't see one;
interestingly, I do see the "more" button which does allow me to do page
setup for printing; curious!
Charles



-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Charles Summey
Sent: Monday, August 10, 2009 2:16 PM
To: perforce-user at perforce.com
Subject: [p4] print?

I'd like to be able to print to a hardcopy the currently displayed
"Client View of Depot"; how do I do that?

Charles
charles.summey at vgt.net
(voice) 434-992-5465
(cell) 865-300-4210

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



------------------------------

Message: 2
Date: Mon, 10 Aug 2009 20:35:07 -0400
From: Jason Perry <jperry at choicestream.com>
To: <perforce-user at perforce.com>
Subject: [p4] Propagating changes from branch to branch
Message-ID: <C6A634FB.2AE44%jperry at choicestream.com>
Content-Type: text/plain;	charset="US-ASCII"

Hi,

I wanted to find out what you guys think is the best approach for this
scenario.

Mainline
Mainline -> Current Branch off of mainline
Mainline -> New Branch off of mainline after Current Branch

The ultimate end goal is to get a change made in the Current Branch to
Mainline and the New Branch

Approach 1
1. A required change is made on the Current Branch
2. The change is then integrated to Mainline from the Current Branch
3. The change is then integrated to the New Branch from the Current
Branch

Approach 2
1. A required change is made on the Current Branch
2. The change is then integrated to Mainline from the Current Branch
3. The change is then integrated to the New Branch from Mainline

Is any of these approaches better than the other?  I am leaning more
towards
Approach 2 because the integrations will be less conflicting.  With
approach
1 though you only have to do one submission.

Let me know what you guys think.

Thanks,
Jay


------------------------------

Message: 3
Date: Tue, 11 Aug 2009 10:29:47 +0530
From: Pankaj Goyal <pankajg at adobe.com>
To: "perforce-user at perforce.com" <perforce-user at perforce.com>
Subject: [p4] Copying files and metadata from one server to another
Message-ID:
	
<720662DBBC1A4D4C900396A2E12258AADD9F60E6C9 at INDIAMBX01.corp.adobe.com>
Content-Type: text/plain; charset="us-ascii"

Hi,
   I have some directories and files in perforce server say "ABC". Now I
want to copy all the directories and files from perforce server "ABC" to
another perforce server "XYZ". During this process I also want to copy
the metadata of the files, specially the version history and all.

Is there any command available on perforce to do this intelligent copy
of files ? Any method/script to do similar task will be highly
appreciated.


Thanks and Regards
Pankaj


------------------------------

Message: 4
Date: Tue, 11 Aug 2009 15:16:40 +1000
From: Stephen Vance <steve at vance.com>
To: "Rainey, Mark (Cleveland)" <Mark_Rainey at intuit.com>
Cc: perforce-user at perforce.com
Subject: Re: [p4] Integration preview
Message-ID: <4A80FEB8.4030102 at vance.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed

Mark --

You may want to e-mail support to add your voice to the request for 
resolvable deletes. The problem you're having is that there is no way to

accept your/theirs for adds or deletes. The Perforce recommendation is 
to modify the branch spec to include/exclude these things, but there are

many of us who feel that's a bit of an inconvenient hack that doesn't 
scale to large development organizations with developers of varying 
skill levels.

Steve

Rainey, Mark (Cleveland) wrote:
> I am running the preview for integrations to figure out who hasn't
> integrated their work from one branch to another.  There are cases
where
> an integrate should not happen but I still want the changes off of the
> preview.  For example I am previewing the integration from //branch1
to
> //branch2.  I delete 3 files on //branch1 but those 3 files should
exist
> on //branch2.  When I run the preview they show up as needing to be
> integrated.  Usually if the file exist on both branches I resolve and
> say accept yours/target which effectively ignores the merge but
creates
> the merge record.  But when files are added or deleted you can't
> resolve.  So how do I get them off of the preview?
>
>  
>
> My only thought would be to go ahead with the add or delete on
//branch2
> and then go on branch2 and back out/rollback that change.  Just
> wondering if there is a better solution (and doesn't include putting
> specific files in the branch spec).
>
>  
>
> Thank you,
>
>  
>
> Mark Rainey
>
> Sr. Software Configuration Engineer
>
>  
>
> Intuit Real Estate Solutions
>
> 216.825.6641
>
> mark_rainey at intuit.com <mailto:mark_rainey at intuit.com> 
>
> www.realestate.intuit.com <http://www.realestate.intuit.com> 
>
>  
>
> Please consider the environment before printing this email.
>
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>
>   

-- 
Stephen Vance
www.vance.com


------------------------------

Message: 5
Date: Tue, 11 Aug 2009 15:29:48 +1000
From: Stephen Vance <steve at vance.com>
To: Pankaj Goyal <pankajg at adobe.com>
Cc: "perforce-user at perforce.com" <perforce-user at perforce.com>
Subject: Re: [p4] Copying files and metadata from one server to
	another
Message-ID: <4A8101CC.4050901 at vance.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed

Check out the backup and restore procedures in the Perforce 
Administrator's Guide.

Steve

Pankaj Goyal wrote:
> Hi,
>    I have some directories and files in perforce server say "ABC". Now
I want to copy all the directories and files from perforce server "ABC"
to another perforce server "XYZ". During this process I also want to
copy the metadata of the files, specially the version history and all.
>
> Is there any command available on perforce to do this intelligent copy
of files ? Any method/script to do similar task will be highly
appreciated.
>
>
> Thanks and Regards
> Pankaj
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>
>   

-- 
Stephen Vance
www.vance.com


------------------------------

Message: 6
Date: Tue, 11 Aug 2009 00:33:54 -0500 (CDT)
From: Tim McDaniel <tmcd at panix.com>
Cc: "perforce-user at perforce.com" <perforce-user at perforce.com>
Subject: Re: [p4] Copying files and metadata from one server to
	another
Message-ID: <Pine.NEB.4.64.0908110024380.27894 at panix1.panix.com>
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed

On Tue, 11 Aug 2009, Pankaj Goyal <pankajg at adobe.com> wrote:
> I have some directories and files in perforce server say "ABC". Now
> I want to copy all the directories and files from perforce server
> "ABC" to another perforce server "XYZ". During this process I also
> want to copy the metadata of the files, specially the version
> history and all.
>
> Is there any command available on perforce to do this intelligent
> copy of files ? Any method/script to do similar task will be highly
> appreciated.

Is XYZ an existing server, or not?  If XYZ does not yet exist, you
might consider

 
<http://kb.perforce.com/AdminTasks/SuperuserTasks/ArchivingDep..tentOffL
ine>
     Archiving Depot Content Off-line
     The depot "copy and obliterate" method
     Article #: 300

If XYZ does exist already, then I'm afraid I'm not experienced enough
to know.  support at perforce.com ?

-- 
Tim McDaniel, tmcd at panix.com


------------------------------

Message: 7
Date: Tue, 11 Aug 2009 00:08:14 -0600
From: Rick Macdonald <rickmacd at shaw.ca>
To: Jason Perry <jperry at choicestream.com>
Cc: perforce-user at perforce.com
Subject: Re: [p4] Propagating changes from branch to branch
Message-ID: <4A810ACE.60004 at shaw.ca>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed

For me, it depends on what these two branches are. If they are unrelated
"new development" branches, I definitely do Approach 2. If they are
release (stabilization) branches, such as rel1.x and rel2.x, I would
likely integrate a bugfix from rel1 to rel2 and then from rel2.x to the
mainline, because (in Laura's words) changes never flow "up" from the
mainline to the more stable release branches (remember the Tofu scale?).

The main reason I'm replying however is to say that with Approach #1, I
would always make 2 separate submissions.  Don't think of this as one 
task to get the change into two branches. Think of this as two tasks to 
get a change into two branches.

Rick

Jason Perry wrote:
> Hi,
>
> I wanted to find out what you guys think is the best approach for this
> scenario.
>
> Mainline
> Mainline -> Current Branch off of mainline
> Mainline -> New Branch off of mainline after Current Branch
>
> The ultimate end goal is to get a change made in the Current Branch to
> Mainline and the New Branch
>
> Approach 1
> 1. A required change is made on the Current Branch
> 2. The change is then integrated to Mainline from the Current Branch
> 3. The change is then integrated to the New Branch from the Current
Branch
>
> Approach 2
> 1. A required change is made on the Current Branch
> 2. The change is then integrated to Mainline from the Current Branch
> 3. The change is then integrated to the New Branch from Mainline
>
> Is any of these approaches better than the other?  I am leaning more
towards
> Approach 2 because the integrations will be less conflicting.  With
approach
> 1 though you only have to do one submission.
>
> Let me know what you guys think.
>
> Thanks,
> Jay
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>
>   



------------------------------

Message: 8
Date: Tue, 11 Aug 2009 08:49:52 +0100
From: Hugo Lamelas <hlamelas at csc.com>
To: perforce-user at perforce.com
Subject: [p4] Hugo Lamelas/CEG/CSC is out of the office.
Message-ID:
	
<OF742AC84F.72865DA6-ON8025760F.002B0496-8025760F.002B0497 at csc.com>
Content-Type: text/plain; charset=US-ASCII


I will be out of the office starting  08/10/2009 and will not return
until
08/24/2009.



------------------------------

Message: 9
Date: Tue, 11 Aug 2009 11:18:54 -0600
From: "Ivey, William" <william_ivey at bmc.com>
To: Kamlesh Mutha <mkamlesh at gmail.com>,	Perforce Users Mailing List
	<perforce-user at perforce.com>
Subject: Re: [p4] Modifying Changelist form
Message-ID:
	
<476996CBBE9AF14285E09E63C370072A1308092A95 at PHXCCRPRD01.adprod.bmc.com>
	
Content-Type: text/plain; charset="us-ascii"

My "reviewer" trigger looks for the the string that's normally
only found in new change forms: "<enter description here>" so it
won't add the "reviewed by" line again to an existing change
form. It's written for bourne shell (standard for our triggers)
and uses the sed command, but otherwise it is very similar to
what you have:

sed -e "s/<enter description here>/&\n\n# Fill in reviewer's name\
 below\nReviewer: <name>/" "$formFile" > "$TMPFILE"

(The & inserts the matched text, then follows it with a blank
line, a comment, and the Reviewer: field.

-Wm


-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Kamlesh Mutha
Sent: Saturday, August 08, 2009 3:39 AM
To: Perforce Users Mailing List
Subject: [p4] Modifying Changelist form

Hi All,

Objective is to insert "ReviewedBy" field text in every changelist form.
This is what I have done and seems to be working fine in my test setup.

Trigger Script:

#!/usr/bin/perl
$formfile = $ARGV[0];  # from %formfile% in trigger table

$defaultin = "^Description:";
$defaultout = "Description:\n\tReviewedBy =>\n";

# Build a modified workspace spec based on contents of %formfile%
$modifiedform = "";
open FORM, $formfile or die "Trigger couldn't read form tempfile";
while ( <FORM> )
{       ## Do the substitution as appropriate.
        if ( m:$defaultin: ) { $_ = "$defaultout"; }
        $modifiedform .= $_;
}
# Write the modified spec back to the %formfile%,
open MODFORM, ">$formfile" or die "Couldn't write form tempfile";
print MODFORM $modifiedform;
exit 0;
[ Snippet of the script from perforce site ]

Triggers setup :

Triggers:
        reviwer form-out change "/home/builduser/modify_change.pl
%formfile%"


Does this look alright or is there any better way to do it?

Thanks and Regards,
Kamlesh





-- 
Faith waiting in the heart of a seed promises a miracle of life which it
can
not prove!
-Ravindranath Tagore
_______________________________________________
perforce-user mailing list  -  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


End of perforce-user Digest, Vol 56, Issue 10
*********************************************




More information about the perforce-user mailing list