[Top][All Lists]

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

Re: cvs merge crash !!

From: Pierre Asselin
Subject: Re: cvs merge crash !!
Date: 20 Dec 2001 21:06:33 -0600

"Zanabria, Moises" <address@hidden> writes:

>That does mean that is no way to check a merge before I really want to

Yes there is.  The merge isn't really over until you commit the
result.  The entire process looks like this:

1)  Check out a *clean* copy from the tip of the trunk.  After the
    check-out, all the files in the local copy have a status of
    "up to date".

2)  Do the merge, with "cvs update -jbranch_start -jbranch_end" .
    This changes some of the files in the local copy, they now have
    a status of "locally modified".  Some of them have conflict
    markers and some don't;  nevertheless, they all appear as "locally
    modified" *as if you had made the changes manually*.

3)  You fix the conflicts, if any, and make sure everything works.

Nothing is permanent yet, you still have a local copy with locally
modified files.  The go/no-go decision comes at the next step.

4a) You commit the result.  The changes go in the repository and the
    local copy appears "up to date" again.
4b) You give up and delete the local copy.  It's as if nothing had
    ever happened.

You can combine steps (1) and (2).  No matter.  The result of a merge
is a sandbox with locally modified files.  The fact that most of the
modifications were done by CVS is immaterial.
Pierre Asselin
Westminster, Colorado

-----= Posted via Newsfeeds.Com, Uncensored Usenet News =----- - The #1 Newsgroup Service in the World!
-----==  Over 80,000 Newsgroups - 16 Different Servers! =-----

reply via email to

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