Re: Rephrasing: question about merging branches

2003-11-05 Thread Jamie Wellnitz
of the merge points with tags. Andy Jones. Thanks, Jamie Wellnitz At 03:37 am 5/11/03, David Wood wrote: I am not sure about something. |If branch A and branch B in your example don't branch form the same |point on the trunk, a merge from point 2 to point 4 into the trunk might

Re: Rephrasing: question about merging branches

2003-11-04 Thread Jamie Wellnitz
try (on the trunk): cvs update -j point2 -j point4 It looks like my point2 is your first child merge point and second child is the tip of branchB (where you put a tag before the merge). Which changes before the first child merge point are you wondering about? Thanks, Jamie Wellnitz [EMAIL

Re: Rephrasing: question about merging branches

2003-11-04 Thread Jamie Wellnitz
made it seem very simple. Thank |you! | |-David | |Jamie Wellnitz [EMAIL PROTECTED] wrote on 11/04/2003 11:50:35 |AM: | |Sorry for the ascii graphic in advance . . . | |If you have (* indicates merge point): | |branchA and branchB originated from trunk at point 1. |branchA merged to trunk

Re: revision/version numbers

2003-11-03 Thread Jamie Wellnitz
Well cvs up -kk -j branch-tag-1 -j branch-tag-2 seems to work okay for me to avoid problems with merging the keywords (I think we've only used $Id$, though). -- Jamie Wellnitz On Mon, Nov 03, 2003 at 09:05:49AM -0500, Donald Sharp wrote: Ick. I hate keyword expansions. The minute you ever

Re: step-by-step installation guide to install CVS on Red hat Linux ?

2003-01-02 Thread Jamie Wellnitz
CVS comes with Red Hat Linux and has for quite some time. So you can just use rpm to install the .rpm file from the install CDs. Are you looking to build a newer version of CVS from source? -- Jamie Wellnitz [EMAIL PROTECTED] On Thu, Jan 02, 2003 at 01:32:16AM -0500, Rajender Gopu wrote: Hi

Re: Merging in CVS

2002-11-22 Thread Jamie Wellnitz
Try xxdiff (http://xxdiff.sourceforge.net). It has an option, -U, which unconflicts a file. It gives you a graphical click-one-or-the-other display of a files with merge conflicts. I've found it to be quite useful. You still have to figure out the relative value of each change, but fixing that

Re: problems accessing repository: no such repository

2002-09-05 Thread Jamie Wellnitz
a commercial product (gasp!) because I haven't been able to make this work for the last week. ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs -- Jamie Wellnitz [EMAIL PROTECTED

Re: Locking a branch

2002-08-27 Thread Jamie Wellnitz
] http://mail.gnu.org/mailman/listinfo/info-cvs Regards, Jamie Wellnitz [EMAIL PROTECTED] ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs