branching and merging

[bpivaty]

Hi all,

 

I recently started to experiment Plastic SCM as a trial for personal development. At work we use ClearCase, and in my previous work I was using Continuus.

I choose Plastic SCM because the branching mechanism is similar to ClearCase, and also because of the branch selector.

 

I have a question:

 

1) In the diagram below I have create a task branch for change /main/chg001, Then I created an integration branch /main/integ_1.1 to merge all task branches for this release.

    Then merged back /main/integ_1.1 branch to the /main branch. This is repeated for each new release. So far so good, how ever, when I switch my workspace to /main branch and issue the command
    cm ls for each 

    

    br:/main/chg001#3   foo.java

 

    I was expecting the following (like it would be in ClearCase):

    

   br;/main#6   foo.java

 

   Does it mean the displayed branch is the one where the change has been done?

   Any explanation?

 

 

example for file foo.java

 

main

(1) ___ (2)  ________________________   (6)

  |           \                                                       ^

  |            \                                                      |

  |             chg001                                          |

  |             (3) ___  (4)                                   /

  |                              \                                 /

  \                               \                              /

    \                              -->  integ_1.1      /

     \ _______________    (5)  _______/

 

 

[manu]

Hi there!

 

You see:

 br:/main/chg001#3   foo.java

Because the revision was created at the "br:/main/chg001" branch and then merged to "br:/main". We don't create new revisions if it's not needed and since foo.java was not changes at "br:/main" the revision metadata is preserved.

 

Not sure if it solves your question.

[bpivaty]

Hi there!,

 

Thank you for the quick answer. It solves my question, and I can keep going practicing with Plastic scm.

 

Sorry for the typos in the original post.

 

Best,

[manu]

You are very welcome! If you have any questions don't hesitate to contact us!