Johannes Kilian writes:
>
> cvs server: PositionOffset.xml: permission mismatch between 1.1 and 1.1.2.1
This indicates that you have enabled the notoriously buggy
PreservePermissions code. Since that has been disabled in recent
releases of CVS, you must either be using a very old release of CVS o
Hi there,
during a merge (from branch to HEAD) I got the following error message
(concerns a lot of files):
---
...
cvs server: PositionOffset.xml: permission mismatch between 1.1 and 1.1.2.1
cvs server: nonmergeable file needs merge
cvs server: revision 1.1.2.1 from
David Everly writes:
>
> So I tried:
>
> * -k 'b' -m 'MERGE'
>
> However, the problem still happens...possibly because all the files
> were checked in on the earlier configuration.
Binary mode forces nomerge. As you already discovered, the correct way
to do this is to use -ko.
-Larry Jones
Thanks...this fixed it...
On Thu, Nov 29, 2001 at 04:12:05PM -0800, Paul Sander wrote:
> Have you looked into using -ko for this purpose?
>
> --- Forwarded mail from [EMAIL PROTECTED]
>
> By the way, the reason I'm using -k 'b' is so that there is no
> substitutionbut these should be all me
Have you looked into using -ko for this purpose?
--- Forwarded mail from [EMAIL PROTECTED]
By the way, the reason I'm using -k 'b' is so that there is no
substitutionbut these should be all mergeable text files.
--- End of forwarded message from [EMAIL PROTECTED]
_
My cvswrappers has:
* -k 'b'
Then I started getting cvs update: nonmergeable file needs merge.
So I tried:
* -k 'b' -m 'MERGE'
However, the problem still happens...possibly because all the files
were checked in on the earlier configuration.
What is the setting
By the way, the reason I'm using -k 'b' is so that there is no
substitutionbut these should be all mergeable text files.
On Thu, Nov 29, 2001 at 04:12:18PM -0700, David Everly wrote:
> My cvswrappers has:
>
> * -k 'b'
>
> Then I started getting c
