[cvsnt] CVSNT Rename/Merge bug.

Phil Hartmann hartmannp at toad-software.com
Tue Jan 25 07:33:30 GMT 2005


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


Branching z.c from mainline into branch, renaming, merging back onto 
mainline.
Filename goes back to mainline's filename.

D:\LOCALP~1\Baseline>cvs tag -b bZ2
cvs server: Tagging .
T .directory_history
T z.c

D:\LOCALP~1\Baseline>cvs update -r bZ2
cvs server: Updating .

D:\LOCALP~1\Baseline>cvs rename z.c z2.cpp

D:\LOCALP~1\Baseline>cvs commit -m "rename"
cvs commit: Examining .
cvs server: Examining .
/TS/Baseline/.directory_history,v  <--  directory update
new revision: 1.1.4.1; previous revision: 1.1
done

D:\LOCALP~1\Baseline>cvs commit -m "Changes"
cvs commit: Examining .
Checking in z2.cpp;
/TS/Baseline/z.c,v  <--  z2.cpp
new revision: 1.1.4.1; previous revision: 1.1
done

D:\LOCALP~1\Baseline>cvs tag bZ1_BCheckin
cvs server: Tagging .
T .directory_history
T z2.cpp

D:\LOCALP~1\Baseline>cvs update -A
cvs server: Updating .
U z.c
cvs server: z2.cpp is no longer in the repository

D:\LOCALP~1\Baseline>cvs update -jbZ1_BCheckin
cvs server: Updating .
RCS file: /TS/Baseline/z.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
Merging differences between 1.1 and 1.1.4.1 into z.c

----- Original Message ----- 
From: "Phil Hartmann" <hartmannp at toad-software.com>
To: "Victor A. Wagner, Jr." <vawjr at rudbek.com>
Sent: Tuesday, January 25, 2005 2:26 AM
Subject: CVSNT


> D:\LOCALP~1\Baseline>cvs add z.c
> cvs add: No CVSROOT specified!  Please use the `-d' option
> cvs [add aborted]: or set the CVSROOT environment variable
>
> DO:\LOCALP~1\Baseline>cvs add z.c
> cvs server: scheduling file `z.c' for addition
> cvs server: use 'cvs commit' to add this file permanently
>
> D:\LOCALP~1\Baseline>cvs commit -m "a"
> cvs commit: Examining .
> RCS file: /TS/Baseline/z.c,v
> done
> Checking in z.c;
> /TS/Baseline/z.c,v  <--  z.c
> initial revision: 1.1
> done
>
> D:\LOCALP~1\Baseline>cvs tag aZ1
> cvs server: Tagging .
> T z.c
>
> D:\LOCALP~1\Baseline>cvs tag -b bZ1
> cvs server: Tagging .
> T z.c
>
> D:\LOCALP~1\Baseline>cvs update -r bZ1
> cvs server: Updating .
>
> D:\LOCALP~1\Baseline>cvs rename z.c z.cpp
>
> D:\LOCALP~1\Baseline>cvs commit -m "rename"
> cvs commit: Examining .
> cvs server: Examining .
> /TS/Baseline/.directory_history,v  <--  directory update
> new revision: 1.1.2.1; previous revision: 1.1
> done
>
> D:\LOCALP~1\Baseline>cvs update -A
> cvs server: Updating .
> U z.c
> cvs server: z.cpp is no longer in the repository
>
> D:\LOCALP~1\Baseline>cvs update -j bZ1
> cvs server: Updating .
>
> D:\LOCALP~1\Baseline> 



-- 
No virus found in this outgoing message.
Checked by AVG Anti-Virus.
Version: 7.0.300 / Virus Database: 265.7.3 - Release Date: 1/24/2005




More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook