Hi Chaturanga,
On Wed, Feb 18, 2015 at 5:10 AM, Chathuranga Rajapaksha <
chathuran...@wso2.com> wrote:
> Hi Sameera,
>
> I tried check-in client in many ways but it didn't catch any conflicts of
> files in local and remote repositories. I upload a file to remote
> repository and create the same file in local repository so that content of
> two file is different. when I update the local repository it just updated
> and didn't show any conflicts. Is this an issue?
>
In order to trigger a conflict, the file you are trying to update after
doing some local changes should be a checked out file from remote registry.
Therefore, what you are experiencing is the expected behavior.
> Can you tell me a use case to catch a conflict
>
In order to experience a conflict situation, follow below steps.
1. Create new collection and a reosurce in it via G-Reg management console.
Ex-
/_system/governance
|
|_test_collection
|
|_test.txt
2. Take a checkout of the newly created collection to file system (not to a
dump file).
Ex -
sh checkin-client.sh co
https://localhost:9443/registry/_system/governance/test_collection -u admin
-p admin --location ./test_collection/
3. Open test.txt with a text editor in local file system and change its
content.
4. Change the content of the test.txt in the registry via the management
console.
5. Navigate to checked out collection using terminal and take an update
using check-in client.
Ex -
sh ../checkin-client.sh up -u admin -p admin
6. You will get following terminal output indicating the conflict in local
file system.
C ./test.txt
No files were added.
No files were updated
1 file(s) found to be conflicting. (Marked as 'C')
No files were deleted
Operation invoked Successfully
And test.txt.mine and test.txt.server will be created containing local
content and registry content respectively.
Please note that conflict detection only occurs when updating a locally
changed resource via check-in client.
When you are checking in locally changed files over a changed files in the
registry they will be overwritten by local content.
Thank you,
SameeraK.
> Thanks
>
> --
>
> Best Regards,
>
> *Chathuranga Lakmal Rajapaksha*
> Software Engineering Intern, WSO2 Lanka (pvt) Ltd.
>
>
> *B. Sc. Eng. (Hons) Undergraduate*
>
> *Dept. of Computer Science and Engineering*
> *University of Moratuwa, Sri Lanka*
> Mobile:+94712894647
>
--
*Sameera Kannangara*
Software Engineer
Platform TG; WSO2 Inc. http://wso2.com
Contact:
phone: +94719541577
Lean . Enterprise . Middleware
_______________________________________________
Dev mailing list
Dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/dev
