[p4] merging changes made on a different server
robert at vaccaperna.co.uk
Fri Nov 10 01:50:58 PST 2006
It is a pain.
I have a script which helps merge changes between 2 servers (with various
caveats). Works fine for the simple case.
On my todo list is to make it more intelligent - happy to have some help!
> -----Original Message-----
> From: perforce-user-bounces at perforce.com
> [mailto:perforce-user-bounces at perforce.com] On Behalf Of
> Denis Perelyubskiy
> Sent: 10 November 2006 02:47
> To: Perforce Mailing List
> Subject: [p4] merging changes made on a different server
> so i don't have a vpn to my company. when i travel i install
> a server on my laptop and do my development. when i come back
> i dump the final versions back and back up the server. this
> sucks 'cause i don't get the history.
> my question is this: can i (and if so, how) check my files
> back into perforce keeping the history intact? if it is
> impossible, how do people deal with issues like this one?
> thank you very much!
> // mailto: Denis Perelyubskiy <lists at
> overwhelmTAKECAPITALSOUT dot net>
> // icq : 12359698
> perforce-user mailing list - perforce-user at perforce.com
More information about the perforce-user