svn status does not show the deletion by merging

2012-05-29 Thread xuzhijun95
Hello, I encountered a very strange problem today, I did a svn merge from branch to trunk, and the output of merging as below, as we can see, the file 'sncpStateInd.cfg' was deleted by merging, but when I enter to the cfg/lib directory, type the svn status, it does not show the deletion ab

Re: svnadmin dump: deleted file order differs between original & mirrored repos

2012-05-29 Thread Dustin Lang
D'oh, I didn't RTFIssues. My apologies. http://subversion.tigris.org/issues/show_bug.cgi?id=4134 --dstn On Mon, 28 May 2012, Dustin Lang wrote: Hi, For backup purposes I keep a mirror of my svn repo. The mirror is modified only by "svnsync", which runs hourly in a cron job. In order

svnadmin dump: deleted file order differs between original & mirrored repos

2012-05-29 Thread Dustin Lang
Hi, For backup purposes I keep a mirror of my svn repo. The mirror is modified only by "svnsync", which runs hourly in a cron job. In order to validate the mirror, I run an "svnadmin dump" on the mirror and on the original, and assert that their md5sums are the same. I am finding that in

Merge files from a moved directory

2012-05-29 Thread Emiliano S
Hi, Suppose there's a directory with a single file in it: dirA\foo.cr10 While I'm modifying this file someone else modifies the file, renames dirA to dirB and commits. dirB\foo.cr11 Before committing I try to update and get a tree conflict, status shows this: A + C dirA

Re: SVN ignore not working

2012-05-29 Thread Rob Brandt
I guess I need to be more clear On 5/29/12 12:17 PM, vishwajeet singh wrote: On Wed, May 30, 2012 at 12:32 AM, Rob Brandt wrote: I am having a terrible time getting ignore to work. On my client, I am using Eclipse SVNKit 1.6.15, and on my Ubuntu server I have 1.6.6dfsg-2ubuntu1.3. I hav

Moving a regular file and creating a symbolic link in its place results in E000014, bad address, and cannot cleanup

2012-05-29 Thread Jared Silva
I tried reproducing using a test repository, but could not. Any ideas on how to unlock my working copy? touch foo svn add foo svn ci svn cp foo bar svn rm foo ln -s bar foo svn add foo svn ci svn: E20: Commit succeeded, but other errors follow: svn: E14: Error bumping revisions post-com

Re: SVN ignore not working

2012-05-29 Thread vishwajeet singh
On Wed, May 30, 2012 at 12:32 AM, Rob Brandt wrote: > I am having a terrible time getting ignore to work. > > On my client, I am using Eclipse SVNKit 1.6.15, and on my Ubuntu server I > have 1.6.6dfsg-2ubuntu1.3. > > I have 2 folders that I need to ignore, they are in my root dir and are > userda

SVN ignore not working

2012-05-29 Thread Rob Brandt
I am having a terrible time getting ignore to work. On my client, I am using Eclipse SVNKit 1.6.15, and on my Ubuntu server I have 1.6.6dfsg-2ubuntu1.3. I have 2 folders that I need to ignore, they are in my root dir and are userdata and ztemp. I set that in Eclipse and it works as expected.