[cvsnt] Merging branch with identical versions still changes

[Glen Starrett]

Thanks for looking at this.

> Merging is _always_ performed against the local sandbox.  You 
> shouldn't need to 
> do this double hop unless you are trying to do the merge on a 
> sandbox that is 
> being used for something else (like a web site).  And in that 
> case, you 
> shouldn't be doing that in the first place; everyone needs 
> their own sandbox, 
> including the web server.

This is about process rather than capability--I have the developers on my
team responsible to update their sandbox with code from MAIN just before
submitting to me for final review and integration with the MAIN line, thus
the extra hop.  It puts the ball in their lap to get everything working with
MAIN line revisions before I inspect it.

> As for why your method causes every file to be marked as 
> modified, without your 
> actual commands (so it can be reproduced) anything I say is 
> speculative.  Create 
> a mini repos and show each of your steps (with the actual 
> command lines involved).

Repro below.  This client has cvsnt 2.0.8 still on command line, but it's
consistent with the results on my 2.0.11 machine.

Regards,

Glen Starrett
 

********************************************************************

C:\temp\junk\test>cvs status -v
cvs server: Examining .
===================================================================
File: test.c            Status: Up-to-date

   Working revision:    1.6
   Repository revision: 1.6     /home/cvsroot/test/test.c,v
   Expansion option:    kv
   Commit Identifier:   77653f84ac702eeb
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          (none)

   Existing Tags:
        R2                              (revision: 1.3)
        R1-Fix                          (branch: 1.1.2)
        R1                              (revision: 1.1)


C:\temp\junk\test>cvs tag -b grs-test1
cvs server: Tagging .
T test.c

C:\temp\junk\test>echo small change >> test.c

C:\temp\junk\test>cvs ci -m "small change"
cvs commit: Examining .
Checking in test.c;
/home/cvsroot/test/test.c,v  <--  test.c
new revision: 1.7; previous revision: 1.6
done

C:\temp\junk\test>cvs up -dA -r grs-test1
cvs server: Updating .
U test.c
cvs server: Updating vendor-imp

C:\temp\junk\test>cvs status
cvs server: Examining .
===================================================================
File: test.c            Status: Up-to-date

   Working revision:    1.6
   Repository revision: 1.6     /home/cvsroot/test/test.c,v
   Expansion option:    kv
   Commit Identifier:   77653f84ac702eeb
   Sticky Tag:          grs-test1 (branch: 1.6.2)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          (none)


C:\temp\junk\test>cvs up -j HEAD
cvs server: Updating .
RCS file: /home/cvsroot/test/test.c,v
retrieving revision 1.6
retrieving revision 1.7
Merging differences between 1.6 and 1.7 into test.c

C:\temp\junk\test>cvs ci -m "update branch"
cvs commit: Examining .
Checking in test.c;
/home/cvsroot/test/test.c,v  <--  test.c
new revision: 1.6.2.1; previous revision: 1.6
done

C:\temp\junk\test>cvs up -dA
cvs server: Updating .
P test.c

C:\temp\junk\test>cvs status
cvs server: Examining .
===================================================================
File: test.c            Status: Up-to-date

   Working revision:    1.7
   Repository revision: 1.7     /home/cvsroot/test/test.c,v
   Expansion option:    kv
   Commit Identifier:   25723faac23678df
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          (none)


C:\temp\junk\test>cvs -q up -d -j grs-test1
RCS file: /home/cvsroot/test/test.c,v
retrieving revision 1.7
retrieving revision 1.6.2.1
Merging differences between 1.7 and 1.6.2.1 into test.c

C:\temp\junk\test>cvs status
cvs server: Examining .
===================================================================
File: test.c            Status: Locally Modified

   Working revision:    1.7
   Repository revision: 1.7     /home/cvsroot/test/test.c,v
   Expansion option:    kv
   Commit Identifier:   25723faac23678df
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          1.6.2.1


C:\temp\junk\test>cvs diff
cvs server: Diffing .

C:\temp\junk\test>cvs ci -m "nothing changed, so why dirty?"
cvs commit: Examining .
Checking in test.c;
/home/cvsroot/test/test.c,v  <--  test.c
new revision: 1.8; previous revision: 1.7
done

C:\temp\junk\test>cvs version
Client: Concurrent Versions System (CVSNT) 2.0.8 (client/server)
Server: Concurrent Versions System (CVSNT) 2.0.11 (client/server)