RE: Merging change sets for a production release,

2013-06-04 Thread Gavin Baumanis
Hi again - I have a follow up question, please. I had an helpdesk issue with 18 changesets attributed to it. It took a while to resolve all the issues - but I finally got there. I did a "diff" on one of the files and I noticed that in the revision that there was a conflict for that file - there

Re: How to use SVN to setup CIMS

2013-06-04 Thread Ryan Schmidt
On Jun 5, 2013, at 01:47, wrote: > I found that the tool of svnlook can cat the edit file with "-t" option in > pre-commit script. That's right, svnlook can look into transactions or revisions. > I do this in the server side, can I do the same this in client side? No; svnlook is the only too

答复: How to use SVN to setup CIMS

2013-06-04 Thread LiberalJin
Dears 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? Best regards LiberalJin -邮件原件- 发件人: Ryan Schmidt [mailto:subversion-20...@ryandesign.com] 发送时间: 2013年6月4日 13:03 收件人: L

Re: authentication error after upgrading client to svn1.8.0-rc2 (accessing a svn1.7.8 server)

2013-06-04 Thread Klaus Welch
On 06/03/13 20:31, C. Michael Pilato wrote: On 05/31/2013 02:26 PM, C. Michael Pilato wrote: Filed an issue for this in the Serf tracker: https://code.google.com/p/serf/issues/detail?id=102 Just to follow up on this: the Serf devs have fixed the problem, and the fix will be included in Serf

RE: Tree conflict on Fresh checkout

2013-06-04 Thread Andrew Reedick
> From: James Hanley [mailto:jhan...@dgtlrift.com] > Sent: Tuesday, June 04, 2013 3:12 PM > To: Andrew Reedick > Cc: users@subversion.apache.org > Subject: Re: Tree conflict on Fresh checkout > > I can reproduce on the versions specified above of the CygWin svn client > within CygWin, but I haven

Re: Tree conflict on Fresh checkout

2013-06-04 Thread James Hanley
I can reproduce on the versions specified above of the CygWin svn client within CygWin, but I haven't tried the native windows svn client. Strange thing is that this is only an issue with MkImage, and MkSharedData... user_dude@computer_node ~/projects/my_project/my_project_03b_pristine $ svn ls -v

RE: Tree conflict on Fresh checkout

2013-06-04 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 > > We are seeing a strange anomaly after our last check-in - on fresh checkout > there is a tree conflict into a new path - I'v

Re: large db/revs files

2013-06-04 Thread olli hauer
On 2013-06-04 16:30, Andre Harper wrote: > Hi, all – > > I am not subscribed and would appreciate being explicitly Cc:ed in any > responses. > > I am on a team that began using subversion near the end of last year. > As a part of our process, we tag each successful run of our systems. > This can

Tree conflict on Fresh checkout

2013-06-04 Thread James Hanley
We are seeing a strange anomaly after our last check-in - on fresh checkout there is a tree conflict into a new path - I've included the output below. user_dude@computer_node~/projects/my_project $ svn co https://svn.my_company.com/svn/my_project_fw/branches/int/ my_project_03b my_project_03b_pris

Re: large db/revs files

2013-06-04 Thread Mark Phippard
On Tue, Jun 4, 2013 at 7:30 AM, Andre Harper wrote: > Hi, all – > > I am not subscribed and would appreciate being explicitly Cc:ed in any > responses. > > I am on a team that began using subversion near the end of last year. > As a part of our process, we tag each successful run of our systems. >

Re: Lines duplicated in dest. file when merging back to trunk

2013-06-04 Thread Andreas Krey
On Tue, 04 Jun 2013 14:09:35 +, Saffer, Simon wrote: ... > > A > B > >some change > >some change > > C > D > > We get no merge conflict, but the text is copied twice into the file on trunk. So, you add one line on trunk, and a different line (and different whitespace miea

Re: large db/revs files

2013-06-04 Thread Thorsten Schöning
Guten Tag Andre Harper, am Dienstag, 4. Juni 2013 um 16:30 schrieben Sie: > We’re having an issue with the db/revs directory size, which for all > our projects currently exceeds 289G. We only use relatively small > working directories containing less than a meg of text files; no > binary files.

large db/revs files

2013-06-04 Thread Andre Harper
Hi, all – I am not subscribed and would appreciate being explicitly Cc:ed in any responses. I am on a team that began using subversion near the end of last year. As a part of our process, we tag each successful run of our systems. This can mean thousands of tags for certain systems every six mont

RE: Lines duplicated in dest. file when merging back to trunk

2013-06-04 Thread Saffer, Simon
Hi, I'm resending this email, now hopefully in plain text. Sorry about that. I’m not subscribed on your mailing list so it would be great if you could Cc me in your responses. I’m having problems with merges going wrong. In our company we sometimes put the same changes on several branches by h

Re: Lines duplicated in dest. file when merging back to trunk

2013-06-04 Thread C. Michael Pilato
On 06/04/2013 09:16 AM, Saffer, Simon wrote: > I’m not subscribed on your mailing list so it would be great if you could Cc > me in you responses. HTML is a really poor format for emails sent to software discussion lists, *especially* when the contents of the mail rely so heavily on formatting det

Lines duplicated in dest. file when merging back to trunk

2013-06-04 Thread Saffer, Simon
Hi, I'm not subscribed on your mailing list so it would be great if you could Cc me in you responses. I'm having problems with merges going wrong. In our company we sometimes put the same changes on several branches by hand (the reason for this involves code that has to talk to a legacy system