[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: merge updates from HEAD into branch by date
From: |
Chris Nicol |
Subject: |
RE: merge updates from HEAD into branch by date |
Date: |
Mon, 9 Sep 2013 16:31:01 +0000 |
> -----Original Message-----
> From: Jim Hyslop [mailto:address@hidden
> Sent: 09 September 2013 18:12
> To: Chris Nicol
> Cc: address@hidden
> Subject: Re: merge updates from HEAD into branch by date
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 13-09-09 5:09 AM, Chris Nicol wrote:
> > Hi,
> >
> > I'm having trouble figuring out the correct syntax for what I want to
> > do.
> [...]
>
> > 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,
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-----