Re: join not producing conflict

[Paul Edwards]

"Mark D. Baushke" <mdb@cvshome.org> wrote in message 
news:mailman.2119.1066773414.21628.bug-cvs@gnu.org...
> The workaround to the unpatched behavior is something like this:
>
>    cvs -n up -p -rrev1 file > file.rev1
>    cvs -n up -p  file > file.rev2
>    diff3 -E -am file file.rev1 file.rev2 > file.new
>    mv file.new file
>
> (except the 'Result of merge' will not be in the CVS/Entries timestamp
> for file in the workaround case).
>
> which is what a typical user might expect the
>
>    cvs up -jrev1 -jrev2 file
>
> command to do for them.

Actually, I found an easier way.

cvs update -r rev1 file

(cvs says "file already contains the differences between 1.2 and 1.1")

cvs update -A file

(desired merge occurs).

BFN.  Paul.