[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Best method to overwrite someone's changes?

From: Christopher.Fouts
Subject: Best method to overwrite someone's changes?
Date: Mon, 18 Apr 2005 14:29:53 -0400

I found this e-mail (below) from Derek a while back. Can I use this
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?


>No, you will only get conflicts if you update from within the branch.
>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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]