David, i Project push, is not an automatic merge.
The merge and source management are in Rational Team Concert which is a
separate product which integrates well with IBM i projects. (This is what
we are using in house to do our own development).
i Projects push will detect timestamp changes in the target library, but it
will be up to you to do the merging.
When you push, you will not clobber, but you will get a message "Pushing
foo foo exists on the host system. It is either being pushed for the
first ime or has been changed on the host system since it was last pushed.
Do you want to overwrite it?"
If you rename your local copy and pull down the remote again, you can
select both and do Compare With -> Each Other from the context menu. This
will allow you to selectively merge changes using Eclipse's powerful
compare tool. Still quite useful.
Hope this helps
|------------>
| From: |
|------------>
>--------------------------------------------------------------------------------------------------------------------------------------------------|
|David FOXWELL <David.FOXWELL@xxxxxxxxx> |
>--------------------------------------------------------------------------------------------------------------------------------------------------|
|------------>
| To: |
|------------>
>--------------------------------------------------------------------------------------------------------------------------------------------------|
|Rational Developer for IBM i / Websphere Development Studio Client for System i & iSeries <wdsci-l@xxxxxxxxxxxx> |
>--------------------------------------------------------------------------------------------------------------------------------------------------|
|------------>
| Date: |
|------------>
>--------------------------------------------------------------------------------------------------------------------------------------------------|
|21/10/2010 06:56 AM |
>--------------------------------------------------------------------------------------------------------------------------------------------------|
|------------>
| Subject: |
|------------>
>--------------------------------------------------------------------------------------------------------------------------------------------------|
|[WDSCI-L] i project push changes feature. |
>--------------------------------------------------------------------------------------------------------------------------------------------------|
|------------>
| Sent by: |
|------------>
>--------------------------------------------------------------------------------------------------------------------------------------------------|
|wdsci-l-bounces@xxxxxxxxxxxx |
>--------------------------------------------------------------------------------------------------------------------------------------------------|
I just experimented with this and it looks like a nice feature, but I don't
understand how it deals with the changes. Ok if I've just added lines, but
what about deleting or modifying?
A coworker is already working on a source I need to modify. We have no way
of managing more than one developer working on the same source. Normally,
I'd just have to note whatever changes I make, then make sure I copy my
changes to the coworkers version if I deploy mine first so that he won't,
how do you say, squash mine when he installs. Now I've discovered "push
changes" in i projects. I've downloaded the coworkers source into my
project, and it's ready to go. I'm a bit scared about this. If I click
"push changes" and the coworker has modified his source since I downloaded
it, what's going to happen?
David FOXWELL
Service Informatique
Tél : 03 90 23 91 63
david.foxwell@xxxxxxxxx<mailto:david.foxwell@xxxxxxxxx>
P Pensez à l'environnement avant d'imprimer ce message
--
This is the Rational Developer for IBM i / Websphere Development Studio
Client for System i & iSeries (WDSCI-L) mailing list
To post a message email: WDSCI-L@xxxxxxxxxxxx
To subscribe, unsubscribe, or change list options,
visit:
http://lists.midrange.com/mailman/listinfo/wdsci-l
or email: WDSCI-L-request@xxxxxxxxxxxx
Before posting, please take a moment to review the archives
at
http://archive.midrange.com/wdsci-l..
midrange.com
