[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
merging the same version again and again and again and again and ...
|
From: |
Harald Dunkel |
|
Subject: |
merging the same version again and again and again and again and ... |
|
Date: |
Tue, 11 Apr 2006 12:30:11 +0200 |
|
User-agent: |
Mail/News 1.5 (X11/20060325) |
Hi folks,
How comes that CVS assumes that some versions in 2 branches
have to be merged again, even though the previous merge and
checkin happened just a few jiffies before, and no file has
been modified since then?
% cvs update -j cde2006_hop1 README
RCS file: /sceng/cvsroot_cde/config/README,v
retrieving revision 1.31.4.3
retrieving revision 1.31.4.3.2.11
Merging differences between 1.31.4.3 and 1.31.4.3.2.11 into README
% cvs commit -m ""
cvs commit: Examining .
% cvs update -j cde2006_hop1 README
RCS file: /sceng/cvsroot_cde/config/README,v
retrieving revision 1.31.4.3
retrieving revision 1.31.4.3.2.11
Merging differences between 1.31.4.3 and 1.31.4.3.2.11 into README
% cvs commit -m ""
cvs commit: Examining .
%
Many thanx in advance
Harri
- merging the same version again and again and again and again and ...,
Harald Dunkel <=
- Re: merging the same version again and again and again and again and ..., Jim Hyslop, 2006/04/11
- Re: merging the same version again and again and again and again and ..., Harald Dunkel, 2006/04/11
- Re: merging the same version again and again and again and again and ..., Jim Hyslop, 2006/04/13
- Re: merging the same version again and again and again and again and ..., Harald Dunkel, 2006/04/18
- Re: merging the same version again and again and again and again and ..., Ingolf Steinbach, 2006/04/19
- Re: merging the same version again and again and again and again and ..., Harald Dunkel, 2006/04/21
- Re: merging the same version again and again and again and again, Larry Jones, 2006/04/21
Re: merging the same version again and again and again and again and ..., Larry Jones, 2006/04/11