info-cvs
[Top][All Lists]
Advanced

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

Knowing that a merge has happened


From: Steve Bement
Subject: Knowing that a merge has happened
Date: Thu, 30 Aug 2001 16:20:58 -0700
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:0.9.3) Gecko/20010801

I'm struggling with one point regarding merging. I understand the mechanics/commands of how to do the merge, but once the merge is done, I can see know way of knowing that it happened.

For example:

+-----+    +-----+    +-----+    +-----+    +-----+
! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 !      <- The main trunk
+-----+    +-----+    +-----+    +-----+    +-----+
               !                           *
               !                          *
               !   +---------+    +---------+
Branch R1fix -> +---! 1.2.2.1 !----! 1.2.2.2 !
                   +---------+    +---------+


Once I have merged the branch into the main trunk, is there a way I can look at revision 1.5, and know that it does indeed contain code merged in from 1.2.2.2? In other words, back on the main branch, how do I know that the merge actually took place?

--
Steve Bement
www.vykor.com





reply via email to

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