[cvsnt] How to get the diffs between branchpoint and tip of branch

[Michael Wojcik]

> From: cvsnt-bounces at cvsnt.org 
> [mailto:cvsnt-bounces at cvsnt.org] On Behalf Of Bo Berglund
> Sent: Tuesday, 28 February, 2006 14:17
> Subject: RE: [cvsnt] How to get the diffs between branchpoint 
> and tip of branch
>
> But what if you forgot to do this? How can you get back to the
> starting point of the branch.
> 
> There needs to be a new flag for update in my view. Something
> like:
> 
> cvs update -B -r BranchTag 
> where -B specifies that the update should be to the base of the
> specified branch. If no branch tag specified then -B is ignored
> or all files revert back to revision 1.1

That would be one possibility.  Another would be to add new syntax for
the -r flag, say something like

	-r rev:r

to mean "the root of the branch containing revision rev".  So:

-r string		equivalent to
---------		-------------
1.3.0.2:r		1.3
1.4:r			1.1
mybranch:r		the revision mybranch was branched from
BASE:r		the revision the current revision was branched from

That would be more general; you could use it for commands like:

	cvs diff -r branch:r -r 1 foo.c

to see what has changed in the trunk since the version from which you
branched, for example.

-- 
Michael Wojcik
Principal Software Systems Developer, Micro Focus