Diff by branch tag and date? Maybe with PCL-CVS?

Diff by branch tag and date? Maybe with PCL-CVS?

[Reiner Steib]

Hi,

this is probably not an Emacs related question, maybe a PCL-CVS
question.

I'm working on the gnus-5_10-branch of Emacs.  Suppose I would like to 
see all the changes in this branch from a certain date upto now.

The command...
$ cvs diff -r gnus-5_10-branch -D yesterday gnus.el
... doesn't work.  It presents a useless diff against the version on
the *trunk* of yesterday:

,----
| diff -u -r1.27.2.2 -r1.27
| --- gnus.el     16 Aug 2004 10:13:58 -0000      1.27.2.2
| +++ gnus.el     1 Sep 2003 15:45:24 -0000       1.27
| [...]
`----

Searching the archives, it seems to me that this isn't possible at all
with cvs, see e.g.
<URL:http://lists.gnu.org/archive/html/info-cvs/2002-08/msg00325.html>
and <URL:https://ccvs.cvshome.org/fom/cache/281.html>.

Maybe there's some a command in PCL-CVS (or a combination of commands)
to view diffs on a branch?

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/

Re: Diff by branch tag and date? Maybe with PCL-CVS?

[Stefan Monnier]

> $ cvs diff -r gnus-5_10-branch -D yesterday gnus.el

This takes "-r foo" to be the start point and "-D bar" to be the end point.
Try "cvs diff -D yesterday gnus.el".

> Searching the archives, it seems to me that this isn't possible at all
> with cvs, see e.g.
> <URL:http://lists.gnu.org/archive/html/info-cvs/2002-08/msg00325.html>
> and <URL:https://ccvs.cvshome.org/fom/cache/281.html>.

You might be right, several combinations can't be done directly with a
`cvs diff' command.

> Maybe there's some a command in PCL-CVS (or a combination of commands)
> to view diffs on a branch?

Nothing beyond what CVS itself provides, I'm afraid,


        Stefan

Re: Diff by branch tag and date? Maybe with PCL-CVS?

[Reiner Steib]

On Mon, Aug 30 2004, Stefan Monnier wrote:

>> $ cvs diff -r gnus-5_10-branch -D yesterday gnus.el
>
> This takes "-r foo" to be the start point and "-D bar" to be the end point.
> Try "cvs diff -D yesterday gnus.el".

I also get the diff between yesterday's trunk and current branch
version here:

,----
| cvs-gnus-5_10-branch/lisp/gnus$ cvs diff -D yesterday nnimap.el|head
| [...]
| diff -u -r1.13 -r1.13.2.2
| --- nnimap.el   29 Jun 2004 12:49:14 -0000      1.13
| +++ nnimap.el   30 Aug 2004 18:18:30 -0000      1.13.2.2
`----

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/

Re: Diff by branch tag and date? Maybe with PCL-CVS?

[Andreas Schwab]

Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes:

> On Mon, Aug 30 2004, Stefan Monnier wrote:
>
>>> $ cvs diff -r gnus-5_10-branch -D yesterday gnus.el
>>
>> This takes "-r foo" to be the start point and "-D bar" to be the end point.
>> Try "cvs diff -D yesterday gnus.el".
>
> I also get the diff between yesterday's trunk and current branch
> version here:

The only reliable way to make diffs on branches is to base them upon tags.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Diff by branch tag and date? Maybe with PCL-CVS?

[Reiner Steib]

On Tue, Aug 31 2004, Andreas Schwab wrote:

> The only reliable way to make diffs on branches is to base them upon tags.

I have a working copy with the gnus-5_10-branch (up to date) and two
quite big patches (KY.patch and SJ.patch) that should be applied to
the branch.  (At a later time, I want to be able to identify those
changes.)  Is the following procedure correct (and reasonable)?

  cd /path/to/gnus-5_10-branch
  cvs update

  cvs tag "gnus-5_10-pre-KY"
  patch < KY.patch
  cvs commit -m "Merge KY changes"
  cvs tag "gnus-5_10-post-KY"

  cvs tag "gnus-5_10-pre-SJ"
  patch < SJ.patch
  cvs commit -m "Merge SJ changes"
  cvs tag "gnus-5_10-post-SJ"

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/

Re: Diff by branch tag and date? Maybe with PCL-CVS?

[Stefan]

> I have a working copy with the gnus-5_10-branch (up to date) and two
> quite big patches (KY.patch and SJ.patch) that should be applied to
> the branch.  (At a later time, I want to be able to identify those
> changes.)  Is the following procedure correct (and reasonable)?
[...]

Yes, it's correct and sadly reasonable (in any recent system, like Arch, you
don't need any such thing since each commit gets its own name).
This has nothing to do with Emacs, tho.  info-cvs@gnu.org is probably
more appropriate.


        Stefan

Re: Diff by branch tag and date? Maybe with PCL-CVS?

[Andreas Schwab]

Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes:

> I have a working copy with the gnus-5_10-branch (up to date) and two
> quite big patches (KY.patch and SJ.patch) that should be applied to
> the branch.  (At a later time, I want to be able to identify those
> changes.)  Is the following procedure correct (and reasonable)?
>
>   cd /path/to/gnus-5_10-branch
>   cvs update
>
>   cvs tag "gnus-5_10-pre-KY"
>   patch < KY.patch
>   cvs commit -m "Merge KY changes"
>   cvs tag "gnus-5_10-post-KY"
>
>   cvs tag "gnus-5_10-pre-SJ"
>   patch < SJ.patch
>   cvs commit -m "Merge SJ changes"
>   cvs tag "gnus-5_10-post-SJ"

Yes, that is a good stategy.  Tags are cheap, and retroactive tagging is
cumbersome and error prone.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."