AF:
NF:0
PS:10
SRH:1
SFN:
DSR:
MID:<20080111115612.1f2caa3d@ripper.onstor.net>
CFG:
PT:0
S:andy.sharp@onstor.com
RQ:
SSV:onstor-exch02.onstor.net
NSV:
SSH:
R:<ken.renshaw@onstor.com>
MAID:1
X-Sylpheed-Privacy-System:
X-Sylpheed-Sign:0
SCF:#mh/Mailbox/sent
RMID:#imap/andys@onstor.net@onstor-exch02.onstor.net/INBOX	0	BB375AF679D4A34E9CA8DFA650E2B04E02EB32CE@onstor-exch02.onstor.net
X-Sylpheed-End-Special-Headers: 1
Date: Fri, 11 Jan 2008 11:56:47 -0800
From: Andrew Sharp <andy.sharp@onstor.com>
To: "Ken Renshaw" <ken.renshaw@onstor.com>
Subject: Re: perfarce help needed
Message-ID: <20080111115647.13397206@ripper.onstor.net>
In-Reply-To: <BB375AF679D4A34E9CA8DFA650E2B04E02EB32CE@onstor-exch02.onstor.net>
References: <BB375AF679D4A34E9CA8DFA650E2B04E02EB32CE@onstor-exch02.onstor.net>
Organization: Onstor
X-Mailer: Sylpheed-Claws 2.6.0 (GTK+ 2.8.20; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Fri, 11 Jan 2008 11:52:25 -0800 "Ken Renshaw"
<ken.renshaw@onstor.com> wrote:

> Since you're doing another checkin right after this, I don't suppose
> it makes sense to checkin what you have to preserve your work and
> then rearrange it again in the next one?

Hard to say.  I'm worried that sloth with overtake me after I complete
the checkins with the files this way.  This has been such a
rabbit-hole, and not even what I am trying to do, just turns out it
really needs to be done as a precursor to what I really need to do.


> -----Original Message-----
> From: Andy Sharp
> To: Ken Renshaw
> Sent: Fri Jan 11 11:48:37 2008
> Subject: Re: perfarce help needed
> 
> On Fri, 11 Jan 2008 11:26:12 -0800 "Ken Renshaw"
> <ken.renshaw@onstor.com> wrote:
> 
> > Is it this big gnarly pending checkin Andy? If it's just the 23
> > files marked 'branch' and 'delete' it might not be *too* painful to
> > fix this changelist manually. If it's all tied up in the 'edits'
> > too then it might be best to start over, as distinctly unappealing
> > as that looks.
> 
> It's very difficult to keep track of all the crap.  Some files are
> branched twice (half going one place and half going another), they get
> different names, and I can't remember all of it.  I guess it's the
> hard way.
> 
> I'm not doing edits on top of branches in this checkin because then
> perfarce does them as adds, and then you can't tell where the file
> came from or went to.  My grand plan was to do a second checkin with
> all the edits, which I've already done in a non-controlled directory.
> 
> But then there's all the edits to all the other files to deal with the
> moved, changed files, and there's no easy way to re-do all of that.
> 
> Yeah, this is the one:
>  
> > [build@k3 ~]$ p4 describe -s 27264
> > Change 27264 by andys@ripper-temp on 2008/01/09 09:53:31 *pending*
> > 
> >         Precursor to porting the cmd_flash code.
> > 
> >         Step 1: flower arranging.
> > 
> >         The sm-opt directory at one time had shareable stuff in it,
> >         but not anymore.  It's time to move this code, and
> > consolidate it with other code, to a place that is more apropriate
> > for what is does -- ssc-optlib.
> > 
> >         Move the initial config stuff out of ssc-optlib into it's
> > own directory, because it doesn't belong where it is or anywhere
> >         else I can think of.
> > 
> >         Fix the includes for all C files that were including one of
> >         the moved header files opt-api.h (now renamed to
> > optlib-api.h) and opt-fs-internal.h (now renamed to fs.h).
> > 
> >         The moved files themselves need fixing, which will be done
> > in a separate checkin immediately following this one.
> > 
> >         Reviewed by
> > 
> > Affected files ...
> > 
> > ... //depot/dev/nfx-tree/Includes/opt-msgs.h#1 branch
> > ... //depot/dev/nfx-tree/Makefile.ssc#9 edit
> > ... //depot/dev/nfx-tree/Makefile.tmfc#1 edit
> > ... //depot/dev/nfx-tree/code/sm-bsd-snmpd/agent/agent_onstor.c#4
> > edit ... //depot/dev/nfx-tree/code/sm-coredump/coredump.h#2 edit
> > ... //depot/dev/nfx-tree/code/sm-event/asd.c#7 edit
> > ... //depot/dev/nfx-tree/code/sm-event/event-api.h#4 edit
> > ... //depot/dev/nfx-tree/code/sm-event/event-as-linux.c#1 edit
> > ... //depot/dev/nfx-tree/code/sm-event/event-as-openbsd.c#2 edit
> > ... //depot/dev/nfx-tree/code/sm-event/event-as.c#10 edit
> > ... //depot/dev/nfx-tree/code/sm-event/event-as.h#4 edit
> > ... //depot/dev/nfx-tree/code/sm-event/event.c#11 edit
> > ... //depot/dev/nfx-tree/code/sm-evm/evm-com-defs.h#12 edit
> > ... //depot/dev/nfx-tree/code/sm-ipmd-lib/ipmd-lib.c#7 edit
> > ... //depot/dev/nfx-tree/code/sm-ipmd/ipmd-kern-linux.c#2 edit
> > ... //depot/dev/nfx-tree/code/sm-ipmd/ipmd-kern-openbsd.c#2 edit
> > ... //depot/dev/nfx-tree/code/sm-ipmd/ipmd-util.c#3 edit
> > ... //depot/dev/nfx-tree/code/sm-ipmd/ipmd-vif.c#4 edit
> > ... //depot/dev/nfx-tree/code/sm-ipmd/ipmd.c#8 edit
> > ... //depot/dev/nfx-tree/code/sm-opt/Makefile#3 delete
> > ... //depot/dev/nfx-tree/code/sm-opt/eee.h#1 delete
> > ... //depot/dev/nfx-tree/code/sm-opt/fs-linux.c#5 delete
> > ... //depot/dev/nfx-tree/code/sm-opt/fs-openbsd.c#7 delete
> > ... //depot/dev/nfx-tree/code/sm-opt/fs.c#3 delete
> > ... //depot/dev/nfx-tree/code/sm-opt/linux.h#2 delete
> > ... //depot/dev/nfx-tree/code/sm-opt/openbsd.h#3 delete
> > ... //depot/dev/nfx-tree/code/sm-opt/opt-api.h#5 delete
> > ... //depot/dev/nfx-tree/code/sm-opt/opt-fs-internal.h#2 delete
> > ... //depot/dev/nfx-tree/code/sm-opt/tfs.c#2 delete
> > ... //depot/dev/nfx-tree/code/sm-sct/Makefile#1 edit
> > ... //depot/dev/nfx-tree/code/sm-sct/taskmgr.c#11 edit
> > ... //depot/dev/nfx-tree/code/sm-spm/spm.h#4 edit
> > ... //depot/dev/nfx-tree/code/sm-tape/tape-msg.c#7 edit
> > ... //depot/dev/nfx-tree/code/sm-tape/tape-rmc.c#3 edit
> > ... //depot/dev/nfx-tree/code/ssc-authen-lib/cifs-map-cfg.c#3 edit
> > ... //depot/dev/nfx-tree/code/ssc-elog/elog.c#6 edit
> > ... //depot/dev/nfx-tree/code/ssc-ifconfig/ssc-ifc-linux.c#8 edit
> > ... //depot/dev/nfx-tree/code/ssc-ifconfig/ssc-ifc-openbsd.c#3 edit
> > ... //depot/dev/nfx-tree/code/ssc-initial-config/Makefile#1 add
> > ... //depot/dev/nfx-tree/code/ssc-initial-config/initial-config.c#1
> > branch ... //depot/dev/nfx-tree/code/ssc-initial-config/initial-config.h#1
> > branch ... //depot/dev/nfx-tree/code/ssc-modify-ro/modify-ro.c#4
> > edit ... //depot/dev/nfx-tree/code/ssc-ndmp/ndmp-agil-tbl.c#2 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxnis/cfg_nfxnis.c#2 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/Makefile#6 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_admin.c#3 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_autosupport.c#8 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_cluster.c#16 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_elog.c#7 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_flash-linux.c#9 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_flash-openbsd.c#14 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_flash.c#3 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_idmap.c#2 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_ndmp.c#4 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_privileges.c#3 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_promupgrade.c#7 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_system.c#35 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/cmd_upgrade.c#16 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/menu.c#6 edit
> > ... //depot/dev/nfx-tree/code/ssc-nfxsh/vtysh-openbsd.c#9 edit
> > ... //depot/dev/nfx-tree/code/ssc-optlib/Makefile#6 edit
> > ... //depot/dev/nfx-tree/code/ssc-optlib/fs-linux.c#1 branch
> > ... //depot/dev/nfx-tree/code/ssc-optlib/fs-openbsd.c#1 branch
> > ... //depot/dev/nfx-tree/code/ssc-optlib/fs.c#1 branch
> > ... //depot/dev/nfx-tree/code/ssc-optlib/fs.h#1 branch
> > ... //depot/dev/nfx-tree/code/ssc-optlib/initial-config.c#11 delete
> > ... //depot/dev/nfx-tree/code/ssc-optlib/initial-config.h#5 delete
> > ... //depot/dev/nfx-tree/code/ssc-optlib/linux.h#1 branch
> > ... //depot/dev/nfx-tree/code/ssc-optlib/openbsd.h#1 branch
> > ... //depot/dev/nfx-tree/code/ssc-optlib/optlib-api.h#1 branch
> > ... //depot/dev/nfx-tree/code/ssc-optlib/redo_hosts.c#2 edit
> > ... //depot/dev/nfx-tree/code/ssc-optlib/tfs.c#1 branch
> > ... //depot/dev/nfx-tree/code/ssc-timekeeper/ntp_utils-linux.c#2
> > edit ... //depot/dev/nfx-tree/code/ssc-timekeeper/ntp_utils-openbsd.c#2
> > edit ... //depot/dev/nfx-tree/code/ssc-timekeeper/ntp_utils.c#9 edit
> > 
> > 
> > 
> > -----Original Message-----
> > From: Andy Sharp
> > Sent: Fri 1/11/2008 11:09 AM
> > To: Ken Renshaw
> > Subject: Re: perfarce help needed
> >  
> > Basically, I moved some files using integrate/delete, but didn't
> > always move them to a file of the same name.  Now, of course, I've
> > decided I don't like where I moved them to, and want to move them
> > somewhere else.  Is there an easy way of moving the already moved
> > (not submitted yet) files somewhere else?  Easier than reverting the
> > integrates and deletes, and re-integrating and re-deleting them?  If
> > I right-click on one of the files in p4v, it gives me a menu with
> > "move/rename" in it, but if I select that, it says "can't
> > move/rename, file is already opened" or something like that.  But if
> > I can't, then why did it give me that option in the menu in the
> > first place.
> > 
> > On Fri, 11 Jan 2008 11:01:33 -0800 "Ken Renshaw"
> > <ken.renshaw@onstor.com> wrote:
> > 
> > > I'm home with a sore throat today Andy, what are we looking at? If
> > > its more typing than you want to do I'd be happy to call you and
> > > we can go through it. 
> > > 
> > > C ya.
> > > 
> > > -Ken
> > > 
> > >  
> > > 
> > > -----Original Message-----
> > > From: Andy Sharp
> > > To: Ken Renshaw
> > > Sent: Fri Jan 11 10:58:03 2008
> > > Subject: perfarce help needed
> > > 
> > > Ken, are you around?  I have some perforce craptasagoria that I
> > > could use some help with.
> > 
