give me an error result:svn: E155035: Can't merge into conflicted
node '/locationToAFile/fileName.java'
search online but cannot find direct answer for this. can you tell me how to
resolve above error and let me continue the revert?
Thanks,James
vn, version 1.8.11 (r1643975)
compiled Dec 16 2014, 13:31:09 on x86_64-redhat-linux-gnu
Thanks,James
the To URL, mention URL of branch B. This should
merge branch B to branch A without loosing any files.
Thanks,James
Thank you, Brane. You are right.
From: Branko Čibej
To: users@subversion.apache.org
Sent: Saturday, November 26, 2016 9:31 AM
Subject: Re: SVN merge between branches is actually overwrite?
On 26.11.2016 14:49, James wrote:
> I just found if I merge branch B to branch A, the
m #4 but Tortoise failed to grape
the changes from server;
- tried command line update command, the same , nothing being updated from
server; but we do have changes on the server;
how can I get these changes from server and merge them into my existing changed
files?
Thanks,James
it configuration file name and location?
Thanks,
James
ow to diagnosis the issue? how to fix it?
Thanks,
James
et)? But I guess it shouldn't matter, right?
Another question is how can I set the selinux allows the svnserve connections?
I don't want to turn it off just because the subversion.
Thanks,
James
On Friday, September 5, 2014 5:31 AM, Philip Martin
wrote:
James writes:
>
ere: proj1 and proj2.
When I try to do checkout with --username --password option, I was asked for
password. After pass the name/password, I received the "svn: E170001:
Authorization failed." error.
My setting in the authz file is not correct? or I need to change more
configurations?
thanks,
James
ill be checked out to
my machine.
is that behavor correct?
On Wednesday, September 10, 2014 2:05 PM, James wrote:
My svnserve is running on Fedora and I can access (checkout, update, ..) with
svn://repository/.. without any issue from local machine and another machine.
I also setup user/pa
I used to add
project is "svn import -m "my message" . svn://homeNetworkIP/repositoryName".
Please help,
Thanks,
James
hen do "svn add ."?
Does the "svn add ." can find new files and ignore existing files to add onto
repository, after commit?
Thanks,
James
On Friday, October 10, 2014 2:35 PM, David Chapman wrote:
On 10/10/2014 11:19 AM, James wrote:
I am trying to add an existing pro
SVN version 1.8.10 (r1615264), in Fedora 20.
I got above error when I try to merge a trunk to branch before I apply my
changes to the trunk from the branch.
I was able to check out the branch, modify the code and commit back to server
and update the branch to the latest reversion. The same is
is which way I should go?
If I checkout folder by folder now, and then checkout again at the top level
one day later, are there duplicated .svn folders then?
Thanks.
James
The result tell me the files are "out of date" and
"path not found". I tried "svn update" , "svn resolved fileName" and "svn
commit -m "comments" fileNames". The results are the same.
I was able to rename files before. But I don't know why it doesn't work for me
this time. Is there a way to commit this deletion?
Thanks,
James
The KDE SVN tells me these two files are NOT under version control but they are
listed as "deleted". Usually the deleted files will not be listed on its window.
From: James
To: "users@subversion.apache.org"
Sent: Saturday, November 22, 2014 9:18 AM
Subject: stuck
I have a file cannot be committed with the error: "Base checksum mismatch on".
How can I fix it?
Thanks,James
I read there are at least three ways to do backup:
1. hotcopy;2. dump;3. incremental backup;
I am just wondering are them all have the history included? If I restore any of
them, I will get everything, including the history or previous revisions, back?
Thanks,James
conf folder, I
cannot do hotcopy automatically. I am thinking just tar all of them daily.
My purpose of backup is just in case my machine die. So how big the difference
will be for my tar approach and the hotcopy?
From: Nico Kadel-Garcia
To: James
Cc: "users@subversion.apache.org&quo
20 on both machines. And I have disabled the SeLinux. The
$getenforce told me "Disabled"
My svn version is 1.8.11.
The instruction I followed to enable the http:// access is from here: SVN
(Subversion) Access Control with Apache and mod_authz_svn | If Not True Then
False
Any ideas?
Thanks,
James
my FVS318 NETGRAR router forwarding the http traffic to my
web server machine which is the same machine as the SVN server.
Any idea?
Thanks,James
If I changed the http:// access port, do I need to checkout my working copy or
I can just switch to the "new" address, or there is no affect my existing
working copy?
From: Joseph Bruni
To: James
Cc: "users@subversion.apache.org"
Sent: Wednesday, February 11, 20
"messages"
.Is there a way to fix it or I have to checkout a fresh copy and copy over the
existing one?
I am using svn 1.8.10 under Fedora 20.
thanks,James
$ svn commit -m "rename scmgmt package to exmgmt"
Adding com/uiapp/exmgmt/ExMgmtMgr.java
svn: E155011: Co
I would like to file a feature request but don't want to clutter the issue
tracker inadvertently. What is the proper process?
Jim Fainer
I am looking to reduce the potential complexity of path access rules by
applying wild card rules in the repository section of the path access rules
configuration.
i.e.
<>
[dev:/branch]
@group1=rw
[dev2:/branch]
@group2=rw
<>
Define repository with a prefix
eng_Project1
eng_
fo as the root of the repository and in the past
I have had to patch in the mergeinfo to get reintegrate to work.
Can anyone enlighten me on this?
Cheers,
James
fo as the root of the repository and in the past
I have had to patch in the mergeinfo to get reintegrate to work.
Can anyone enlighten me on this?
Cheers,
James
Hello,
Over the past three weeks I have changed and committed some files. I
need to somehow recurse through the directories and show me only the
files I have changed. How do I do this?
I suppose I could write a script to do this, but I suspect Subversion is
sophisticated enough, and I am
Recently, Red Hat Enterprise Linux 5 updated its Subversion package
from 1.5.x to 1.6.11.
This exposed a *forwards* compatibility problem: the Subversion 1.6
hotcopy command fails on Subversion 1.5 repositories:
$ svnadmin hotcopy test-repo test-repo.HOTCOPY; echo $?
svnadmin: Can't open file 'te
On 2011-02-28 at 10:49-08 David Chapman wrote:
> A "hot copy" by definition is one that will safely allow read-only
> access while the backup is in progress.
But I asked about "svnadmin dump", not "svnadmin hotcopy".
Are you asserting that read-only repository access (in our case, via
WebDAV via
I'm currently dealing with a Tree conflict on a directory and I'm unable
to find good information on resolving this using google (I keep finding
information on files), and am wondering what hte best approach is to
resolve this issue.
The background is that we have two developers working on fea
Upgrading to svn 1.7 whose principal feature is a major change to the working
copy, with local mods, is just plain dumb.
From: Igor d [mailto:igoro...@gmail.com]
Sent: 18 October 2011 15:20
To: Igor d; users@subversion.apache.org
Subject: Re: Help! Subversion Exception!
But if i have a lot of di
s attempting to build the file list to show which files have
been modified.
What I've done: I've rebooted my machine - result: no change.
Let me know what I can do to help find a solution to this. Thanks!
-James
y that this is using server version 1.6.17 and the merging was
performed on Windows 7.
Cheers,
James
-Original Message-
From: Stefan Sperling [mailto:s...@elego.de]
Sent: 26 October 2011 11:29
To: James French
Cc: users@subversion.apache.org
Subject: Re: Behaviour of reintegrate in 1.7.1
On Wed, Oct 26, 2011 at 10:02:17AM +0100, James French wrote:
> I was prompted to give 1.7.
It happens when about 20GB's of data has been downloaded.
Anyone else see this?
--
James
-Original Message-
From: KARR, DAVID [mailto:dk0...@att.com]
Sent: 08 November 2011 20:31
To: users@subversion.apache.org
Subject: Good strategies for incorporating an external code drop
Subversion works fine when developers have access to the SVN repo. I'm working
on a project where
ntained if the project was not deleted from the trunk? (I
worry about mergeinfo...)
Cheers,
James
I created a project in our repository and used import to load the source code.
Now my working folder has every icon that svn has any ideas?
Please consider the environment before printing this email.
---
From: David Chapman [mailto:dcchap...@acm.org]
Sent: Wednesday, December 07, 2011 12:15 PM
To: James Lopes; users@subversion.apache.org
Subject: Re: New to SVN
(The convention on this list is not to top-post. Also, please "reply all" so
that the entire conversation can be searc
From: David Chapman [mailto:dcchap...@acm.org]
Sent: Wednesday, December 07, 2011 11:48 AM
To: James Lopes
Cc: users@subversion.apache.org
Subject: Re: New to SVN
On 12/7/2011 8:16 AM, James Lopes wrote:
I created a project in our repository and used import to load the source code.
Now my
From: James Lopes [mailto:jlo...@bostonfinancial.com]
Sent: Wednesday, December 07, 2011 12:51 PM
To: David Chapman
Cc: users@subversion.apache.org
Subject: RE: New to SVN
From: David Chapman [mailto:dcchap...@acm.org]
Sent: Wednesday, December 07, 2011 11:48 AM
To: James Lopes
Cc: users
Please consider the environment before printing this email.
IMPORTANT NOTICE. The information contained in this electronic message and any
attac
For autopopulate I’ve setup for shell scripts to be text/plain, native eol
and executable
*.ksh= svn:mime-type=text/plain;svn:eol-style=native;svn:executable
But I have a shell script removeCTLM.ksh that has an embedded cntl-m as
part of a regular expression, for example sed 's/^M//g' $fi
I would like to upgrade my subversion from 1.4.3 to the newest one. What is
entailed to do this?
Thanks
James Boden
IT Specialist
Western Regional Center for Correctional Ed
18415 Roxbury Road
Hagerstown, Md. 21740
301-766-9443
jbo...@dllr.state.md.us<mailto:jbo...@dllr.state.md.us>
automatically
upgraded, if I am understanding correctly.
James Boden
IT Specialist
Western Regional Center for Correctional Ed
18415 Roxbury Road
Hagerstown, Md. 21740
301-766-9443
jbo...@dllr.state.md.us
From: Stefan Sperling [s...@elego.de]
Sent: Wednesday
So if I get this right, I do not have to upgrade each step, I can jump to the
1.7.2 version. Is there an installer for this?
James Boden
IT Specialist
Western Regional Center for Correctional Ed
18415 Roxbury Road
Hagerstown, Md. 21740
301-766-9443
jbo...@dllr.state.md.us
Andy, what do you mean svadmin dump/load route? Is this for the repositories?
Sorry for being dense here, I just mainly use the software and not do a lot of
maintenance to it.
James Boden
IT Specialist
Western Regional Center for Correctional Ed
18415 Roxbury Road
Hagerstown, Md. 21740
301
if and when to upgrade the repository).
that the repositories could use the svnadmin upgrade. Would I still have to do
a dump/reload if I did the upgrade?
James Boden
IT Specialist
Western Regional Center for Correctional Ed
18415 Roxbury Road
Hagerstown, Md. 21740
301-766-9
gree?
It would be lovely to be able to set up ignores centrally too without relying
on individual devs to get it right.
Cheers,
James
-Original Message-
From: Les Mikesell [mailto:lesmikes...@gmail.com]
Sent: 17 April 2012 16:57
To: James French
Cc: Subversion Users
Subject: Re: default ignores
On Tue, Apr 17, 2012 at 10:18 AM, James French
wrote:
> Hi group,
>
>
>
> Just wanted to have a bit of
From: Les Mikesell [lesmikes...@gmail.com]
Sent: 17 April 2012 19:34
To: James French
Cc: Subversion Users
Subject: Re: default ignores
On Tue, Apr 17, 2012 at 1:08 PM, James French
wrote:
>
> I would say that it is up to the user to check their
All,
I'm raising the issue that there should be an option to include merge
information of an "ls -v" in much the same way that "svn blame"
supports it. Although, I can easily use "svn blame -g" to find out who
/originally/ added a file, it's not intuitive, the more natural method
(IMHO) is to use
Sorry for late reply - thanks for that information Johan. Glad that there's
work going on in this area :)
-Original Message-
From: Johan Corveleyn [mailto:jcor...@gmail.com]
Sent: 18 April 2012 16:32
To: James French
Cc: Les Mikesell; Subversion Users
Subject: Re: default ignore
to ask
--
Regards,
James
Withers
Developer
Email: ja...@vortexcommerce.com
Tel: +44
(0) 1423 226 554
Mobile:
07903 983 393
Skype
There's no interest/descending/rebuttal opinion to this? Should I
create a enhancement ticket? I thought that this was the medium to
first propose changes/enhancements for discussion.
On Mon, Apr 30, 2012 at 4:16 PM, James Hanley wrote:
> All,
>
> I'm raising the issue that
When creating a branch, it would be very useful if merge data could
optionally be included in svn status -u with the -g option.
Essentially, it would tell you if there are changes upstream from the
origination of the branch... I'm not entirely certain what the output
should look like, but it might
-Original Message-
From: Stefan Sperling [mailto:s...@elego.de]
Sent: 25 June 2012 15:41
To: Attila Nagy
Cc: Philip Martin; users@subversion.apache.org
Subject: Re: svn rm much slower on 1.7.5 than on 1.6 (with SQL timings)
On Mon, Jun 25, 2012 at 04:33:50PM +0200, Attila Nagy wrote:
>
).
Cheers,
James
From: Stefan Sperling [s...@elego.de]
Sent: 25 June 2012 18:59
To: James French; users@subversion.apache.org
Subject: Re: moving files in repobrowser generates mergeinfo
On Mon, Jun 25, 2012 at 07:55:05PM +0200, Stefan Sperling wrote:
> On Mon, Jun
From: Stefan Sperling [s...@elego.de]
Sent: 26 June 2012 10:06
To: James French
Cc: users@subversion.apache.org
Subject: Re: moving files in repobrowser generates mergeinfo
On Tue, Jun 26, 2012 at 09:47:06AM +0100, James French wrote:
> Thanks Stefan
ven't found anything for the clients, yet.
Thanks,
-JimC
--
James Cloos OpenPGP: 1024D/ED7DAEA6
s for the confirming that. That will save
me some time.
-JimC
--
James Cloos OpenPGP: 1024D/ED7DAEA6
Hi,
I just noticed that svn 1.6 did not url encode the output of svn diff
-summarize (ie spaces in files not replaced with %20), whereas svn 1.7 does.
There is nothing in changes.txt about it. Is the 1.7 behaviour correct?
Cheers,
James
or getting wc.db into a bad state and not knowing how to
recover.
I've attached a screenshot from tortoisesvn.
Cheers,
James<>
From: Stefan Sperling [s...@elego.de]
Sent: 28 August 2012 15:03
To: James French
Cc: users@subversion.apache.org
Subject: Re: 'invalid status for updateting properties' error during
reintegrate merge (was: no subject)
On Tue, Aug 28, 2012 at
change the line endings but I'm too scared to check
in to find out. Tomorrow I'm going to try with 1.6 and see what that does.
What the hell is going on?
Cheers,
James
change the line endings but I'm too scared to check
in to find out. Tomorrow I'm going to try with 1.6 and see what that does.
What the hell is going on?
Cheers,
James
change the line endings but I'm too scared to check
in to find out. Tomorrow I'm going to try with 1.6 and see what that does.
What the hell is going on?
Cheers,
James
From: James French [james.fre...@naturalmotion.com]
Sent: 04 October 2012 22:39
To: users@subversion.apache.org
Subject: svn:eol-style native and reintegrate merge
Hi,
Using svn 1.7.6 and working on a dev branch I wrote a script to set
svn:eol-style
.7.6 fix and it sounds scarily pertinent
From: James French [james.fre...@naturalmotion.com]
Sent: 05 October 2012 09:58
To: users@subversion.apache.org
Subject: RE: svn:eol-style native and reintegrate merge
ld
affect this?
____
From: James French [james.fre...@naturalmotion.com]
Sent: 05 October 2012 12:59
To: users@subversion.apache.org
Subject: RE: svn:eol-style native and reintegrate merge
http://svn.apache.org/viewvc?view=revision&revision=1355703
Fix a bug in propset which could prev
Hi,
If I update a folder with -set-depth=empty and then update a child folder with
-set-depth=infinity the parent is still reported as having empty depth by svn
info. This is with svn 1.7.6.
Is this by design? Seems weird to me...
James
We are seeing merge tree conflicts where I believe svn is not working
as expected. I'm not entirely sure if this is due to a lack of
understanding for proper use on our part, but it was my understanding
that reintegrate was to be used when pulling changes from a branch and
pushing them into the co
at 7:22 PM, Matthew Pounsett wrote:
>
> On 2013/02/22, at 14:15, James Hanley wrote:
>
>> We are seeing merge tree conflicts where I believe svn is not working
>> as expected. I'm not entirely sure if this is due to a lack of
>> understanding for proper use on
Yes I have used git, etc - in the past, but we are forced to use svn
for the time being.
What I would like to quantify is if this shortcoming of subversion is
by design or if its a bug. From your description, it seems like the
former, and if so, what is the architectural reasoning?
I understand
I guess I should have read the next response in the thread before replying...
On Feb 24, 2013, at 7:52 AM, Stefan Sperling wrote:
> On Sun, Feb 24, 2013 at 12:14:04PM +, Andreas Tscharner wrote:
>>> So what is the proper way to continuously perform the workflow we're
>>> trying to do - that
59 AM, Stefan Sperling wrote:
> On Sun, Feb 24, 2013 at 07:55:41AM -0500, James Hanley wrote:
>> Is this a use case that was taken into consideration, and will it be
>> "fixed" or the functionality/logic added to allow this use case?
>
> See my other reply for
)
On Feb 24, 2013, at 7:59 AM, Stefan Sperling wrote:
> On Sun, Feb 24, 2013 at 07:55:41AM -0500, James Hanley wrote:
>> Is this a use case that was taken into consideration, and will it be
>> "fixed" or the functionality/logic added to allow this use case?
>
> See
can you test if the reintegrate option is
removed completely from the script, how does it perform against 1.8 -
as I don't have a sandbox to test?
On Sun, Feb 24, 2013 at 9:19 AM, Stefan Sperling wrote:
> On Sun, Feb 24, 2013 at 07:57:14AM -0500, James Hanley wrote:
>> I guess I sho
com/rpjday
>
>
Hi Robert,
I had a quick Google around and found this which shows how to set up Trac
with svn and Apache for FC4 and later.
http://trac.edgewall.org/wiki/TracOnFedoraCore
<http://trac.edgewall.org/wiki/TracOnFedoraCore>I hope it might be of some
use to you?
--
James Bailey
http://subversion.wandisco.com
mer: I
haven't tried it.
James
n't hesitate in getting in touch with me and I'll happily get someone to
provide you with some further details should you wish me to do so.
Let me know.
Kind Regards,
James Bailey
Community Site Engineer
WANdisco, Inc.
On Sat, Feb 13, 2010 at 5:32 PM, Arsen Shnurkov wrote:
> Where one
Jeff Mott wrote:
I've recently needed to track changes for vendor code drops, so I read
the SVN book's vendor branches chapter. But I'm not entirely happy
with part of the procedure, so I'd like to talk it out and, I hope,
find a better way.
I struggled with findinng a way to do this too. I ca
e in the right direction would be greatly appreciated. All the
forum and mailing list posts that I found relating to this error were
solved by doing an svnadmin upgrade, though I have actually tried that
and still no joy.
Thanks in advance,
James.
PS. I have already posted this to serverfault.com but not much joy so far.
On 24/03/2010 14:31, Mark Phippard wrote:
On Wed, Mar 24, 2010 at 10:26 AM, James Thomson wrote:
Now I try and do a merge using the Subversion client in Debian:
svn mergeinfo https://mysvn/repo .
and I get the following error:
svn: Retrieval of mergeinfo unsupported by '
On 24/03/2010 14:37, Mark Phippard wrote:
On Wed, Mar 24, 2010 at 10:39 AM, James Thomson wrote:
On 24/03/2010 14:31, Mark Phippard wrote:
On Wed, Mar 24, 2010 at 10:26 AM, James Thomson
wrote:
Now I try and do a merge using the Subversion client in Debian:
svn
We've been successfully using ant scripts in conjunction with subversion to
check out/compile code from the subversion repository in a windows xp
environment. we recently got new machines with windows 7 operating system and
now when i try to run the ant build script I get the following error:
svn.
Regards,
James
I was handed a dump file by a 3rd party and I am supposed to analyze it. I've
got it loaded and can look at the log and do all the usual things without any
apparent errors. But I notice that some revision numbers are missing. How can
this be?
Thanks!
Jim Knoke
Sr. Security Engineer
EWA-
While attempting update the trunk of https://github.com/EllisLab/CodeIgniter I
received the following error.
---
Subversion Exception!
---
Subversion encountered a serious problem.
Please take the time to report this on the Subversion mailing list
w
Hello,
Attached please find a crash report during an attempt to merge something to a
trunk.
James C Patten
Senior Programmer/Analyst, OIT OCFS/DLRS
State of Maine, Office of Information Technology
james.pat...@maine.gov<mailto:james.pat...@maine.gov>
207-557-0349 (Desk/Cell)
svn
Sorry. I'm using the distribution from Collabnet.
From: Stefan Hett [mailto:ste...@egosoft.com]
Sent: Monday, January 25, 2016 7:30 AM
To: Patten, James
Cc: 'subversion'
Subject: Re: Subversion crash report
Hi James,
Stefan,
Windows client, using a Powershell script running
.
James
From: Stefan Hett [mailto:ste...@egosoft.com]
Sent: Monday, January 25, 2016 10:58 AM
To: Patten, James
Cc: 'subversion'
Subject: Re: Subversion crash report
Sorry. I'm using the distribution from Collabnet.
From: Stefan Hett [mailto:ste...@egosoft.com]
Sent: Monday, Jan
as last time.
Log files are included.
From: Stefan Hett [mailto:ste...@egosoft.com]
Sent: Monday, January 25, 2016 1:37 PM
To: Patten, James
Cc: 'subversion'
Subject: Re: Subversion crash report
Hi James,
I downloaded SlikSVN and installed it, using the Typical installation. I then
ere are also some hints in the
file about how to ensure the agent gets started.
While the above isn't a solution, hopefully it's enough information to
figure out where the disconnect is.
Cheers,
--
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7 2D23 DFE6 91AE 331B A3DB
tra .svn folders should not be there? How to avoid
them?
Thanks,
James
--libs libsvn_client
> -lsvn_client -lapr-1 -luuid -lrt -lcrypt -lpthread -ldl
>
> ... but what is installed is libsvn_client-1:
This was fixed in r1863990 and will be part of the 1.14 release.
Cheers,
James
would appreciate advice anyone has with this situation, or tips
from anyone who has dealt with anything similar.
Many thanks,
James.
--
I have done something wrong in my import and it is killing me not having the
SVN feature after using it for years. Is there anyone I could get help from
remotely to resolve?
757-438-6061
Jim Hart
President
Definitive Concepts, Inc.
1 - 100 of 161 matches
Mail list logo
