[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

update -jx -jy gives conflict on $Id$

From: Palle Girgensohn
Subject: update -jx -jy gives conflict on $Id$
Date: Thu, 08 Mar 2001 19:37:59 +0100


Like most others, we have a comment in the top of most of our
sourcefiles with the $Id$ keyword. Say I have version
of a file checked out, and I want to incorporate the changes
made in change  1.13 into this branch. Only the modification in
the 1.13 patch should go inte my branch, not those from

$ cvs update -j1.12 -j1.13 file.c would fix this, but it leaves
an annoying conflict in the head comment, due to the $Id$ diff
beeing between 1.12 and 1.13, and my Id tag is

$ cvs update -kk -j1.12 -j1.13 file.c resolves this problem,
but -kk is sticky, which is not what I want.

I guess there is a way around having to resolve this conflict
manually every time, but I haven't figured it out. If you have,
please share it.

         Partitur Informationsteknik AB    
Wenner-Gren Center             +46 8 566 280 02  
113 46 Stockholm               +46 70 785 86 02  
Sweden                         address@hidden

reply via email to

[Prev in Thread] Current Thread [Next in Thread]