It's all about the answers!

Ask a question

Changes of a file in different change sets


Weilim Er (4612013) | asked Sep 11 '11, 10:35 p.m.
Hi,

If I am working on 2 change sets concurrently and both require changes of a same source file.

Scenario.

1. Make local change to A.java (Unresolved folder)
2. Check-in A.java to Change Set A-1 (Outgoing folder)
3. Make another local change to A.java (Unresolved folder)
4. Check-in A.java to Change Set A-2 (Outgoing folder)

Question
1. Can step 4 be executed successfully? I got an error when i tried that.
2. When step 3 is done, does the content of A.java in the outgoing folder updated with the latest changes, or does it only contain changes from step 1 (and not step 3)?
3. What is the best practice to manage concurrent changes of the same file to different change sets?

Appreciate your prompt help in this.

2 answers



permanent link
Geoffrey Clemm (30.0k23035) | answered Sep 11 '11, 11:30 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
On 9/11/2011 10:53 PM, erwl88 wrote:
Hi,

If I am working on 2 change sets concurrently and both require changes
of a same source file.

Scenario.

1. Make local change to A.java (Unresolved folder)
2. Check-in A.java to Change Set A-1 (Outgoing folder)
3. Make another local change to A.java (Unresolved folder)
4. Check-in A.java to Change Set A-2 (Outgoing folder)

Question
1. Can step 4 be executed successfully? I got an error when i tried
that.

If you want perform step 4, after step 2, you need to right click on
change-set A-1, and apply the "complete" operation.

2. When step 3 is done, does the content of A.java in the outgoing
folder updated with the latest changes, or does it only contain
changes from step 1 (and not step 3)?

It depends on whether you have the "auto-checkin" preference set (it is
off by default).

3. What is the best practice to manage concurrent changes of the same
file to different change sets?

You need to "complete" your changes for that file for one of the change
sets before you can checkin changes to that file to a different change set.

Cheers,
Geoff

permanent link
Tim Mok (6.6k38) | answered Sep 12 '11, 8:49 a.m.
JAZZ DEVELOPER
Just so you know, working on the two change sets concurrently with modifications to the same file will mean one of the change sets depends on the other. When you deliver your second change set, it will require the first change set to be delivered to prevent a gap.

Your answer


Register or to post your answer.