Re: Tree conflict on Fresh checkout

2013-06-05 Thread Shahid khan
On Jun 5, 2013 5:13 PM, "James Hanley" wrote: > I'm using Google Apps Mail... but I think I've set it to plain-text. > > user_dude@computer_node ~/projects/my_project/my_project_03b_pristine > $ svn ls -v Project/settings | grep -i mkimage >2528 cm_user May 30 19:28 MkImage/ >

RE: Tree conflict on Fresh checkout

2013-06-05 Thread Andrew Reedick
> From: James Hanley [mailto:jhan...@dgtlrift.com] > Sent: Tuesday, June 04, 2013 1:44 PM > To: users@subversion.apache.org > Subject: Tree conflict on Fresh checkout > > A    my_project_03b_pristine/Project/settings/MkSharedData.exe >   C my_project_03b_pristine/Project/settings/MkImage >   A

Re: How to use SVN to setup CIMS

2013-06-05 Thread Les Mikesell
On Mon, Jun 3, 2013 at 9:46 PM, wrote: > Dears, > > I want to set up a cims by SVN. The system need to do a series test before > commit. The changes can be committed until the test passed. The question is > that the test machine is not the svn client the same as the code committed, > I want to kn

Re: Tree conflict on Fresh checkout

2013-06-05 Thread James Hanley
I'm using Google Apps Mail... but I think I've set it to plain-text. user_dude@computer_node ~/projects/my_project/my_project_03b_pristine $ svn ls -v Project/settings | grep -i mkimage 2528 cm_user May 30 19:28 MkImage/ 2528 cm_user64131 May 30 19:28 MkImage.exe user_d

Re: 答复: How to use SVN to setup CIMS

2013-06-05 Thread Thorsten Schöning
Guten Tag liberal...@viatech.com.cn, am Mittwoch, 5. Juni 2013 um 08:47 schrieben Sie: > I found that the tool of svnlook can cat the edit file with "-t" > option in pre-commit script. I do this in the server side, can I do the same > this in client side? No, the client doesn't see the server ge