[cvsnt] (no subject)

[Prochazka, Jan]

Hello,

we experience something similar. "Arbitrary" files after merge are marked as
modified and consequently committed, but there is no one byte difference. We
use branches heavily and has more then 1000 files and the situation happens
all the time on few of them (~ up to 10 ?). The files that experience that
are different all the time, are not new, and we were not able to find any
reason or any way to reproduce the trouble reliable so far.

Jan


> -----Original Message-----
> From: Harrison, Andrew [mailto:andy.harrison at anite.com]
> Sent: Wednesday, November 10, 2004 10:07 AM
> To: Cvs-NT Mailing List (E-mail) 
> Subject: [cvsnt] Unusual branching / merging problem
> 
> 
> Hi,
> 
> I've got an unusual problem with our repository. All our 
> development is done
> on branches, which are then merged back into the trunk when they are
> complete. Some users have been having merge problems, and 
> looking at the RCS
> logs it seems like something like the following has happened:
> 
> 	User1 creates Branch-1 and starts major development.
> 
> 	At some point later, User2 creates Branch-2 and the 
> changes include
> the addition of a file "newfile" rev 1.1.2.1.
> 	Branch-2 gets merged into the trunk, newfile now at rev 1.2.
> 
> 	Later still, User3 creates Branch-3 and the changes 
> include a change
> to "newfile" -> rev 1.2.x.1.
> 	Branch-3 gets merged into the trunk, newfile now at rev 1.3.
> 
> 	User1 has now completed his work, but want to test it with the
> latest trunk changes first, so merges the trunk into his branch.
> 	The resulting revision of newfile on Branch-1 has 
> revision number
> 1.3.x.1, has a mergepoint of 1.3, but contains the same data 
> as revision
> 1.2.
> 
> I have tried to recreate this in a test repository but have 
> been unable to
> do so. Has anyone else seen anything similar to this, or have 
> any idea what
> has happened?
> 
> We're using CVS-NT server 2.0.41.
> 
> Thanks,
> Andy
> 
> --
> Andy Harrison - Platform Software Engineer 
> Anite Telecoms Ltd. 127 Fleet Road, Fleet, Hampshire, GU51 3QN, UK
> [http://www.anite.com/telecoms]
> "No matter how bad things seem... nothing could be worse than 
> being used as
> a towel rail." - A.A. Milne
> 
> 
> 
> 
> Scanned for viruses by MessageLabs. The integrity and 
> security of this message cannot be guaranteed. This email is 
> intended for the named recipient only, and may contain 
> confidential information and proprietary material. Any 
> unauthorised use or disclosure is prohibited.
> _______________________________________________
> cvsnt mailing list
> cvsnt at cvsnt.org
> http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt
>