merge updates from HEAD into branch by date

[Chris Nicol]

Hi,

I'm having trouble figuring out the correct syntax for what I want to do.

I want to bring all the modifications in the HEAD branch made between 9 and 11 am on June 9th 2011 into my branch 'branch1'. The modifications were made between tags 'tag11' and 'tag12' on the HEAD branch/trunk.

I have a checked-out copy of 'branch1' and from its root I have run

cvs update -P "-jHEAD:6/9/11 9:00" "-jHEAD:6/9/11 11:00"
and
cvs update -P "-jtag11:6/9/11 9:00" "-jtag12:6/9/11 11:00"
and many other variants.

I've also tried running these on named sub-directories.

My working copy does not get updated with the changes I want.

cvs diff -D "6/9/11 9:00" -D "6/9/11 11:00"
DOES show the changes I want.

I am using an old server (v1.1.17) on Linux and an old client (CVSNT 2.0.51d) on Windows, so I imagine my problem might be due to bugs or incompatibilities, but I would like to know the correct syntax all the same.

Thanks in advance,
Chris Nicol

[Jim Hyslop]

Post by Chris Nicol
Hi,
I'm having trouble figuring out the correct syntax for what I want to do.

[...]

Post by Chris Nicol
I have a checked-out copy of 'branch1' and from its root I have run
cvs update -P "-jHEAD:6/9/11 9:00" "-jHEAD:6/9/11 11:00" and cvs
update -P "-jtag11:6/9/11 9:00" "-jtag12:6/9/11 11:00" and many
other variants.

Specify *either* a tag *or* a date, not both:

cvs update -P -jtag11 -jtag12

or

cvs update -P "-j6/9/11 9:00" "-j6/9/11 11:00"

- --
Jim Hyslop
Dreampossible: Better software. Simply. http://www.dreampossible.ca
Consulting * Mentoring * Training in
C/C++ * OOD * SW Development & Practices * Version Management

[Chris Nicol]

-----Original Message-----
Sent: 09 September 2013 18:12
To: Chris Nicol
Subject: Re: merge updates from HEAD into branch by date
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Post by Chris Nicol
Hi,
I'm having trouble figuring out the correct syntax for what I want to do.

[...]

Post by Chris Nicol
I have a checked-out copy of 'branch1' and from its root I have run
cvs update -P "-jHEAD:6/9/11 9:00" "-jHEAD:6/9/11 11:00" and cvs
update -P "-jtag11:6/9/11 9:00" "-jtag12:6/9/11 11:00" and many other
variants.

cvs update -P -jtag11 -jtag12
or
cvs update -P "-j6/9/11 9:00" "-j6/9/11 11:00"

Jim,

Thanks for the reply but the date-only option gets this result:
cvs [update aborted]: Numeric join tag 6/9/11 9:00 may not contain a date specifier

The required format seems to be
-jSymbolic_Tag:Date_Specifier

Regards,
Chris Nicol

- --
Jim Hyslop
Dreampossible: Better software. Simply. http://www.dreampossible.ca
Consulting * Mentoring * Training in
C/C++ * OOD * SW Development & Practices * Version Management -----
BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (Darwin)
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with undefined - http://www.enigmail.net/
iEYEARECAAYFAlIt80QACgkQLdDyDwyJw+MYOgCgsGlfQIM1hLTsOgC4f6DQrd
uq
ktEAoOsZVquFs4cgUle/czpnGrUgo6yR
=igLj
-----END PGP SIGNATURE-----