This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Summary: | [CVS update] local modify/remotely deleted incorrectly handled | ||
---|---|---|---|
Product: | versioncontrol | Reporter: | err <err> |
Component: | CVS | Assignee: | issues@versioncontrol <issues> |
Status: | NEW --- | ||
Severity: | blocker | ||
Priority: | P2 | ||
Version: | 6.x | ||
Hardware: | All | ||
OS: | All | ||
Issue Type: | ENHANCEMENT | Exception Reporter: |
Description
err
2007-07-24 00:51:42 UTC
When I attempted to make the rather large checkin. I get a dialog: CVS Command failed with the following error: cvs [add aborted]: there is no version here; do 'cvs checkout' first Don't know if it's related. BTW. There was nothing in messages.log. I have no idea what it is complaining about. I agree that printing more explanatory status would be useful in this case. Let me explain current state: *Conflict* means remote changes and local changes are incompatible (remote changes cannot be merged with local changes during update). This is your case, also the case when you have a locally new file and the same file was already added into repository and also the most common case is that both parties modify a single line of text. *Locally/Remotely Modified means that there are local and remote changes but the actual state (mergeable or conflict) will be determined during Update In case you have a conflict that cannot be resolved in the Conflict Resolver (via CVS/Resolve Conflicts) - the first two cases above - use Revert Modifications and Update. This will revert your local changes and then updates your working copy. As you mentioned in the last paragraph, the exact reason for the conflict is shown in the conflict dialog. Thanks for the clarification. Part of my confusion came from seeing "remotely deleted" as a status for some stuff, but
that delete-state info being unavailable for the cases I had trouble with.
> In case you have a conflict that cannot be resolved in the Conflict Resolver
> (via CVS/Resolve Conflicts) - the first two cases above - use Revert Modifications
> and Update. This will revert your local changes and then updates your working copy.
In the local-modify/remote-delete case, without knowing that the remote file is gone, it is difficult to revert
modifications. Yes, its true its in the dialog, but the info is buried; if the dialog grouped the conflict messages at
the top, or displayed them in red, or ...
BTW, after the initial update there was also a locally-deleted/remotely-modified file. So I guess the way to handle this
would be to revert-modification (undo the local delete), update, do the local delete again.
Certainly additional status info would have helped. I wonder if conflict resolution options for these two cases would be
useful? Or would it be "too friendly" letting people get into trouble since the proper resolution requires a revert?
|