When a remote source physical file or member is downloaded to an i Project,
its last modified timestamp is cached internally for later comparisons. Later,
when you select Show Remote Objects at the i Project level,
or the select the Push Selected or Push
Changes action, you will be warned if that object has been modified
on the remote server.
Conflicts on a push can happen in two situations:
- There is no locally stored member timestamp for a member and the member
exists on the server. This can happen if :
- The member is newly created in the workspace without retrieving it initially
from the server
- The member is renamed
- The member is copied or moved from another member (in either this source
file or another source file)
- The server is changed in the connection
- The connection is changed, causing the server to change
- The associated library is changed
- The parent source file is renamed, copied, or moved
- There is a locally stored member timestamp, the member exists on the server,
and its timestamp is different than the stored one. This can happen if:
- The member on the server is updated after the last time the workspace
counterpart has been pushed
- The member on the server is restored from a backup copy
If there is a conflict, you will be prompted with a warning dialog:
- If you select Yes, you will overwrite the member
on the server.
- If you select Yes to All, all members that conflict
for the duration of this push operation will be overwritten without further
warning.
- If you select No, this member will not be pushed
to the server.
- If you select No to All, all members that conflict
during this particular push operation will be skipped without further warning.
- If you select Cancel, the push operation will be
canceled.
Any member that is actually pushed will have its new server timestamp recorded
locally so it will not conflict again unless you update them again on the
server. Any member that is skipped will conflict again. You can fix this either
by pushing the member to the server the next time or by manually copying this
member from the server.
Attention: If you upload a member or source file to the server
from an i Project,
and the local record length is longer than the server's record length, you
will be warned that truncation of data can occur. This warning will be given
each time that the source file is pushed. To fix this, adjust your data to
fit the host file size and then create a new source file on the workstation
with the new shorter record length and copy all members into it.