Re: does not show conflicts

[mail4newsgroups]

Just an update. I have installed 1.11.14 and run 'cvs -nq up' on the
same workspace and that version reports the conflicts. Switching back
to 1.11.21 against the same workspace and running 'cvs -nq up', again,
does not report any conflicts.

Also, I came across the exact same issue reported between 1.12.9 and
1.12.13.

http://tinyurl.com/o8wun


Regards,
Cristian


address@hidden wrote:
> I have just came across an issue and I would appreciate any help or
> feedback on this.
>
>
> We are running CVS Server 1.11.4 on SUSE 9 and accessing the server
> remotelly over 'ssh'. The client that I had used until a week ago was
> the exact version as the server, namelly 1.11.4 also running on SUSE 9.
>
> About a week ago, I got my own desktop and I installed Fedora Core 5,
> which came with CVS 1.11.21. I had used this box to do a merge on
> Friday. I have done the merge from a branch to the Trunk as I usually
> do, using 'cvs -q up -dP -j MY_BRANCH -kk' (this was the first merge
> off this branch).
>
> I have logged the stdout and stderr to a file, just to get a record,
> but I did not inspected the file contents. When the update was done, I
> have issued a 'cvs -nq up' to see what has changed and if any conflicts
> and what I got was approximatelly 25-30 files merged showing the "M
> foo/bar" but no conflicts reported.
>
> I went ahead and commited all the changes, not before patting myself on
> the back for being so lucky not to get any conflicts.
>
> Today, someone comes up and says that a bunch changes off that branch
> were not merged it. I asked for a specific file to be named and I got
> one (partyAlert.jsp). As I kept the workspace, I went to the directory
> in question and did a 'cvs -nq up' and a few files showed that need
> update ("U foo/bar").
>
> I looked at the CVS/Entries file for partyAlert.jsp and this is what it
> shows.
> /partyAlert.jsp/1.15/Result of merge+Fri Jul 21 17:54:59 2006/-kk/
>
> The file also has conflict markers inserted in it and the .# backup
> file is present.
>
> This time I looked at the merge output and indeed there were a bunch of
> conflicts signaled in the stdout at the time of the merge. Went to the
> top level directory of my workspace, did again a 'cvs -nq up', no
> conflicts reported, only files that need update.
>
> /home/cristian/merges/UI_IT2_WCC70_HEAD/CUDS
> address@hidden cvs -nq up
> cvs update: nothing known about CustomerDataStewardship
> cvs update: nothing known about CustomerDataStewardshipDocuments
> cvs update: nothing known about CustomerDataStewardshipModel
> cvs update: nothing known about CustomerDataStewardshipModelTests
> cvs update: nothing known about CustomerDataStewardshipWeb
> U
> CustomerDataStewardshipWeb/JavaSource/com/dwl/datastewardship/nl/DataStewardshipLabels.properties
> U
> CustomerDataStewardshipWeb/JavaSource/com/dwl/datastewardship/nl/DataStewardshipLabels_de.properties
> U
> CustomerDataStewardshipWeb/JavaSource/com/dwl/datastewardship/nl/DataStewardshipLabels_es.properties
> <snip>
>
>
> Wanting to play around with the workspace while preserving it for the
> time being, I have copied the whole structure to another directory (cp
> -r source destination) and to my amazement, when I moved into that
> directory and did a 'cvs -nq up' all of the conflicts are showing up. I
> have repeated the same copy of the workspace with the same results.
>
>
> /home/cristian/merges/UI_IT2_WCC70_HEAD.bak/CUDS
> address@hidden cvs -nq up
> cvs update: nothing known about CustomerDataStewardship
> cvs update: nothing known about CustomerDataStewardshipDocuments
> cvs update: nothing known about CustomerDataStewardshipModel
> cvs update: nothing known about CustomerDataStewardshipModelTests
> cvs update: nothing known about CustomerDataStewardshipWeb
> <snip>
> C
> CustomerDataStewardshipWeb/JavaSource/com/dwl/datastewardship/nl/DataStewardshipLabels_zh_TW.properties
> C
> CustomerDataStewardshipWeb/JavaSource/com/dwl/datastewardship/nl/DataStewardshipStrings.properties
> C
> CustomerDataStewardshipWeb/JavaSource/com/dwl/datastewardship/nl/DataStewardshipStrings_de.properties
> C
> CustomerDataStewardshipWeb/JavaSource/com/dwl/datastewardship/nl/DataStewardshipStrings_es.properties
> <snip>
>
>
> So I was wondering if anyone knows of this issue.
> 
> 
> Thanks a lot,
> Cristian