Is there any notion of Checkout Reserved in Jazz?
Hi all,
this post actually concerns "non mergeable" files (like Word Documents etc...)
Here's the problem we ran into:
- Assumptions:
- Jazz works without any "Check out" feature.
- several file format forbid merges of contents (*.doc, *.xls, *.vsd, *.pdf, etc...)
- Consider that 2 users modify the same file for which no merge of content is possible:
1) What occurs when the 2 users try to deliver their modifications in Jazz?
The last file that was committed will overwrite the previous one without actually including its change set: if those files were changed in parallel, there's not any mechanism that will allow the users to notice that and to collaborate on that file. It's gonna be the last version accepted by the Stream's integrator that will be loaded by the rest of the team.
2) Is there any proposed work around for the files that we can't merge?
Thanks!
this post actually concerns "non mergeable" files (like Word Documents etc...)
Here's the problem we ran into:
- Assumptions:
- Jazz works without any "Check out" feature.
- several file format forbid merges of contents (*.doc, *.xls, *.vsd, *.pdf, etc...)
- Consider that 2 users modify the same file for which no merge of content is possible:
1) What occurs when the 2 users try to deliver their modifications in Jazz?
The last file that was committed will overwrite the previous one without actually including its change set: if those files were changed in parallel, there's not any mechanism that will allow the users to notice that and to collaborate on that file. It's gonna be the last version accepted by the Stream's integrator that will be loaded by the rest of the team.
2) Is there any proposed work around for the files that we can't merge?
Thanks!
One answer
You are correct that there is no reserved checkout or locking at the file level in Jazz. Originally, we wanted to ensure that our design was friendly to being distributed, meaning that you may not always have access to the central repository. In those cases being restricted by a lock to modify a file doesn't make sense.
> 1) What occurs when the 2 users try to deliver their
> modifications in Jazz?
The first deliver succeeds and the second will fail with a conflict. The user can inspect/talk to ther other developer via the integrated chat, and decide how to resolve. For binary files (although MS Word does support comparing/merging documents) like images, the second developer would have to pick his or the one that was delivered.
> The last file that was committed will overwrite the
> previous one without actually including its change set
No. Deliver will never ever overwrite on a conflict. It will fail and the user will have to resolve.
We have plans post 1.0 to introduce locking policies for teams which would like to be more proactive about conflicts on certain file types.
Jean-Michel Lemieux
Jazz Source Control Team
> 1) What occurs when the 2 users try to deliver their
> modifications in Jazz?
The first deliver succeeds and the second will fail with a conflict. The user can inspect/talk to ther other developer via the integrated chat, and decide how to resolve. For binary files (although MS Word does support comparing/merging documents) like images, the second developer would have to pick his or the one that was delivered.
> The last file that was committed will overwrite the
> previous one without actually including its change set
No. Deliver will never ever overwrite on a conflict. It will fail and the user will have to resolve.
We have plans post 1.0 to introduce locking policies for teams which would like to be more proactive about conflicts on certain file types.
Jean-Michel Lemieux
Jazz Source Control Team