Jump to content


Remote fetch

remote fetch

  • Please log in to reply
3 replies to this topic

#1 darrenc

darrenc

    Newbie

  • Members
  • Pip
  • 2 posts

Posted 09 July 2019 - 04:45 PM

Hi,

I'm having some difficulty pulling from a remote server. The original pull went without a hitch, I was able to pull from the external companies remote server, then push to ours (cloned).

Since the original fetch there's been changes on both servers with a few conflicts, our server seems to pick up there's file conflicts but I don't seem to be able to do any resolving.

p4 -u ************ fetch -r remote -t
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#1 (add).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
Conflict: change 21 //*********/*********/********//file#2 (edit).
0 conflicting change(s) were relocated to '//tangent/000031/...'.
Run 'p4 resubmit' to resolve and resubmit conflicting change(s).

I'm not sure where I go from here, p4 resubmit seems to suggest there's no conflicts/changes. The tangent is also saying no changes were relocated?

How do I resolve these files?

Thanks

#2 Sambwise

Sambwise

    Advanced Member

  • Members
  • PipPipPip
  • 976 posts

Posted 09 July 2019 - 09:13 PM

Does an "unsubmit"-based fetch work any better than the tangent flavor?

Do you have all the appropriate permissions on the local server?  Does the tangent depot already exist (with the type "tangent") and if not do you have the permission to create it?  If you didn't you SHOULD be getting an error but maybe there's a bug there -- getting "0 conflicting changes" is clearly wrong.  Are you sure there aren't any error messages interspersed in the rest of that output?

#3 darrenc

darrenc

    Newbie

  • Members
  • Pip
  • 2 posts

Posted 13 July 2019 - 04:43 PM

Thanks for the pointers Sambwise.

I think the issue was caused by the server machine not actually having the work-space setup (I was fetching on the server machine rather than my desktop). Once I had setup a work-space on the server machine it seemed to conflict/relocate properly, and has enabled me to fetch/push to the remote server.

#4 Sambwise

Sambwise

    Advanced Member

  • Members
  • PipPipPip
  • 976 posts

Posted 13 July 2019 - 05:55 PM

Ah -- that's worth filing as a bug, you should get some sort of explicit error telling you that you need a workspace (I don't remember exactly how "resubmit" works but since it requires you to open files it would be reasonable for it to be tied to a workspace).  This workflow is usually done on "local" servers (which are always automatically initialized with a workspace) so you might be the first person who's actually hit that error condition.  :)





Also tagged with one or more of these keywords: remote, fetch

0 user(s) are reading this topic

0 members, 0 guests, 0 anonymous users