Can I accept a subset of a change-set in Jazz?

Hi gangchen,

You can accept part of of a change-set by right-clickong on the
change in the Pending Changes view and selecting "New > Patch". That
will create a Jazz patch that you can apply to your workspace via
"Project > Apply Patch".

I'm not sure why one would want to do this, however - changes are
grouped together because their individual files are usually
interdependent. Picking individual files may leave you in a state where
your workspace won't compile, or will start to exhibit weird errors.

e

gangchen wrote:

This has been bothering me for a while. Often time, the pending change
view give me some incoming change-set. Within a change-set, I only
need a subset or several files to check out into my workspace. I
found there is no control on this function. Anyone can share some
light on how to selectively accept incoming change-set? Thanks...

I'm not sure why one would want to do this, however - changes are
grouped together because their individual files are usually
interdependent. Picking individual files may leave you in a state where
your workspace won't compile, or will start to exhibit weird errors.

In practice, change sets are grouped at a much larger level than resource
interdependencies. Reasons range from the developer being lazy, to the
developer is trying to group all work related for an enhancement work item.

If you are about to edit a resource and it is part of an incoming change
set, accepting just that resource might avoid a gap/merge situation.

Randy Hudson wrote:

I'm not sure why one would want to do this, however - changes are
grouped together because their individual files are usually
interdependent. Picking individual files may leave you in a state where
your workspace won't compile, or will start to exhibit weird errors.

In practice, change sets are grouped at a much larger level than resource
interdependencies. Reasons range from the developer being lazy, to the
developer is trying to group all work related for an enhancement work item.

If you are about to edit a resource and it is part of an incoming change
set, accepting just that resource might avoid a gap/merge situation.

Theoretically, we could emulate this mode using the existing
infrastructure, assuming that the subset of the change set was actually
consistent on its own (no missing parent folders, for example).

Feel free to raise an enhancement request.

JohnC

hi guys,


once I create a patch, how do I get rid of the incoming change on which I have applied a patch?

The incoming change-set stays there, as if I didn't accept it yet.

Thanks,

On Fri, 23 May 2008 04:17:50 +0000, davely wrote:

once I create a patch, how do I get rid of the incoming change on which
I have applied a patch?

The incoming change-set stays there, as if I didn't accept it yet.

The incoming changeset stays there because you didn't accept it and it is
still incoming. If you don't want it to be incoming anymore then you can
run the "replace in <stream>" action.

- Dmitry

Dmitry Karasik wrote:

On Fri, 23 May 2008 04:17:50 +0000, davely wrote:

once I create a patch, how do I get rid of the incoming change on which
I have applied a patch?

The incoming change-set stays there, as if I didn't accept it yet.

The incoming changeset stays there because you didn't accept it and it is
still incoming. If you don't want it to be incoming anymore then you can
run the "replace in <stream>" action.

- Dmitry

This is a very big hammer ... you will effectively be making the
decision for the team to revert the stream to what you have in your
workspace. If this is not a decision that you feel comfortable making,
then I would not suggest running that action.

Just because something is incoming, it does not mean that you need to
accept it. What is your concern about keeping changes incoming?

JohnC
SCM Server

I can keep them in incoming, but as I apply the patch on incoming change-sets, then I have to manually know which was the last change-set I patched, and also these files create possible conflicts(orange arrow) on files that I haven't worked on.

Is there a way to have a new clean repository, so that I can accept everything from the rep, without mine so that I can resume my work on a fresh copy ???

I tried reloading the stream, but it kept all my changes as they were. I also tried a new eclipse workspace and loading the stream but it brings me back to the same place.

Any ideas ?

thanks a lot

...

I tried reloading the stream, but it kept all my changes as they were. I also tried a new eclipse workspace and loading the stream but it brings me back to the same place.

To get rid of outgoing changes:

1. If you want to keep some of your outgoing changes, select those files in the Pending Changes view, run "New > Patch" on them. Save the patch somewhere to disk.

2. Select the component in the Pending Changes view, right click, and run 'Replace with > Latest from <stream>'. This will get rid of your outgoing changes and replace them with whatever is in the stream.

3. To recover the changes from (1), apply the patch.

hth,
e