[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Best method to overwrite someone's changes?
From: |
Christopher.Fouts |
Subject: |
RE: Best method to overwrite someone's changes? |
Date: |
Mon, 18 Apr 2005 15:06:59 -0400 |
Or maybe this...
> cd to branchA sandbox
> cvs up -j branchA -j tag_yesterday_branchA
> cvs commit
>-----Original Message-----
>From: address@hidden
>[mailto:address@hidden
>] On Behalf Of Fouts Christopher (IFNA MP DC)
>Sent: Monday, April 18, 2005 2:30 PM
>To: address@hidden
>Subject: Best method to overwrite someone's changes?
>
>
>I found this e-mail (below) from Derek a while back. Can I use
>this method to revert a branch to a certain tag date? IOW,
>
> > cvs up -r branchA -j tag_yesterday_branchA -j branchA
> > cvs commit
>
>Will this revert latest branchA's code to tag_yesterday_branchA's code?
>
>-chris
>
>
>>No, you will only get conflicts if you update from within the branch.
>Fabi's
>>approach will work, except you should probably add a step to
>delete all
>
>>working files in B before copying files from A.
>
>
>I'm telling you:
>
> cvs up -rbranchA -jbranchA -jbranchB
> cvs commit
>
>No conflicts. No manual adding/removing. It just works.
>
>Derek
>
>
>
>
>
>_______________________________________________
>Info-cvs mailing list
>address@hidden
>http://lists.gnu.org/mailman/listinfo/info-cvs
>