Hi!
Like most others, we have a comment in the top of most of our
sourcefiles with the $Id$ keyword. Say I have version 1.6.2.1
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 1.6.2.1 branch, not those from
1.7-1.12.
$ 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 1.6.2.1.
$ 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.
TIA
Palle
--
Partitur Informationsteknik AB
Wenner-Gren Center +46 8 566 280 02
113 46 Stockholm +46 70 785 86 02
Sweden [EMAIL PROTECTED]
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
