[EMAIL PROTECTED] wrote:

>     Joining from file revisions on another branch has no effect on local file.
>
>     CVS version:  1.11.1p1 (client/server)  Linux
>
>     CVS command: cvs update -j2.10 -j2.11 com.c
>
>     2.10 and 2.11 are on branch22; local working file is on branch5
>
>     2.11 was produced by deleting ten consecutive lines at line 7679 in 2.10.
>     The corresponding lines are at line 7598 in com.c(branch5).
>
>     The join does not change the local file.
>
>     Could that be because the change made between 2.10 and 2.11 is too far
>     away from the corresponding text in the local file (82 lines)?

What error message are you seeing?

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:[EMAIL PROTECTED]         CollabNet ( http://collab.net )
--
I will not get very far with this attitude.
I will not get very far with this attitude.
I will not get very far with this attitude...

          - Bart Simpson on chalkboard, _The Simpsons_




_______________________________________________
Bug-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/bug-cvs

Reply via email to