Perforce: merge files from a continuous directory to an integration directory...

2014-05-06 Thread Mark Wilhelm
I have continuous and integration build jobs. I would like to run my integration build so that it runs Perforce to automatically move files (not merge) from the dev branch/directory into the int branch/directory and then run the integration build. How or what are the commands for Perforce/Jenk

Perforce: merge files from a continuous directory to an integration directory...

2014-05-07 Thread Stuart Rowe
Can you describe your branch structure a little more? How are your integration builds triggered? If you're trying to move changes from your development branch to another branch why don't you want to merge? Conceptually I would approach this as: 1) start an integration of your Dev branch up to

Re: Perforce: merge files from a continuous directory to an integration directory...

2014-05-07 Thread Mark Wilhelm
Just a basic setup: depot/project/dev/src depot/project/int/src I have a continuous build running on the "dev" structure every few minutes. I have a nightly build that runs on the "int" structure. When you ask "why don't you want to merge?", are you asking from a manual perspective? I would li

Re: Perforce: merge files from a continuous directory to an integration directory...

2014-05-07 Thread Mark Wilhelm
ok, some more "work"... I put these commands in the "EWbc" window and it works: "C:\Program Files\Perforce\"p4 -u build-user -P xxx change -o "C:\Program Files\Perforce\"p4 -u build-user -P xxx integrate -d -i -t //Project/dev... //Workspace/Project/int... "C:\Program Files\Perforce\"p4 -u build-

Re: Perforce: merge files from a continuous directory to an integration directory...

2014-05-07 Thread Stuart Rowe
Try this approach (there may be typos / gotchas - it's completely untested) 1) Enable Perforce SCM on your integration project in Jenkins - set up the client spec 'myclientspec' to use the mapping: //project/dev/... //myclientspec/dev/... //project/int/... //myclientspec/int/...

Re: Perforce: merge files from a continuous directory to an integration directory...

2014-05-09 Thread Mark Wilhelm
Thanks, I'll give it a go. For #4, are you putting these into a "Execute Windows batch command" build step"? On Wednesday, May 7, 2014 2:18:57 PM UTC-5, Stuart Rowe wrote: > > Try this approach (there may be typos / gotchas - it's completely untested) > > 1) Enable Perforce SCM on your integrati

Re: Perforce: merge files from a continuous directory to an integration directory...

2014-05-09 Thread Stuart Rowe
Yes, the p4 commands can just be in a windows batch command build step. I'm not sure how you're building / testing though. Keep in mind that the p4 commands I suggested will open files for integrate in the default changelist. On May 9, 2014 10:21 AM, "Mark Wilhelm" wrote: > Thanks, I'll give it