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.
Harrison, Andrew wrote:
> Right! And that is exactly what I'm trying to do, but I can't get it to
> work!
>
> [Main]
> |
> 1.1--[Branch1]
> |
> (1.2)--[Branch2]
>
> I now want to merge Branch1 into Branch2. There have been no changes in
> either branch (in this file). What would you expect the result to be?
>
Exactly what happens... absolutely nothing, since branch1 hasn't changed
since branch2 was created.
$ cvs log mergetest.txt
Working file: mergetest.txt
head: 1.2
branch:
locks: strict
access list:
symbolic names:
branch2: 1.2
branch1: 1.1
keyword substitution: kv
total revisions: 2; selected revisions: 2
description:
----------------------------
revision 1.2
date: 2004/02/24 20:16:14; author: tmh; state: dead; lines: +0 -0;
kopt: kv; commitid: 5f4403bb10e0000;
*** empty log message ***
----------------------------
revision 1.1
date: 2004/02/24 20:15:41; author: tmh; state: Exp; kopt: kv;
commitid: 628403bb0ec0000;
*** empty log message ***
=============================================================================
$ cvs update -r branch2 mergetest.txt
cvs server: mergetest.txt is no longer in the repository
$ cvs update -j branch1 mergetest.txt
$ cvs status mergetest.txt
===================================================================
File: no file mergetest.txt Status: Up-to-date
Working revision: No entry for mergetest.txt
Repository revision: 1.2 D:/repo/bintest/mergetest.txt,v
Expansion option: kv
Commit Identifier: 5f4403bb10e0000
Tony