Re: merging problem

[Jim Hyslop]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Larry Jones wrote:
> You're doing the merge wrong.  You merge the changes *between* two
> revisions into another revision.  In this case, you want to merge the
> changes between revisions 1.1.2.1 and 1.1.2.2 into the head of the trunk
> (revision 1.2), so the command you want is:
> 
>       cvs up -r1.2 -j1.1.2.1 -j1.1.2.2 doc/Makefile.am
> 
> (If you already have revision 1.2 in your working directory, which you
> probably do, you don't need the "-r1.2".)

Won't the -r option set it sticky, and prevent you from checking in the
merge results?

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDYFNpLdDyDwyJw+MRApiQAKDgXjlVIXSdqx/O5kzi30oeDf0KXgCg+ODD
1bw4vhavSNVnH0X5ne/WXCU=
=UHLs
-----END PGP SIGNATURE-----