|
From: | Ingolf Steinbach |
Subject: | Re: merging the same version again and again and again and again and ... |
Date: | Wed, 19 Apr 2006 09:14:47 +0200 |
User-agent: | Thunderbird 1.5 (Windows/20051201) |
Harald Dunkel wrote: [...]
% 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.13 Merging differences between 1.31.4.3 and 1.31.4.3.2.13 into README
[...] Could you please send us the output of % cvs diff -r1.31.4.3 -r1.31.4.3.2.13 README I could imagine that they are identical. Is that right? With your cvs update command, you state that you want to merge the changes from the cde2006_hop1 branch into your working copy. There have been changes to the README file in that branch (13 revisions). These changes are then merged into your local README. It does not matter that the 13th revision in that branch is the same as the original version. Kind regards Ingolf -- Ingolf Steinbach Jena-Optronik GmbH ingolf.steinbach@jena-optronik.de ++49 3641 200-147 PGP: 0x7B3B5661 213C 828E 0C92 16B5 05D0 4D5B A324 EC04
[Prev in Thread] | Current Thread | [Next in Thread] |