Dave,
Thank you for the tip...that fixed the issue.
Best regards,
Amad
On Wed, Feb 12, 2014 at 11:50 AM, Dave Huang wrote:
> On 2014-02-12 11:46 AM, C M wrote:
>
>> For what it's worth, line 93 refers in the config file is listed below.
>> As far as I know, this f
94 ### Set no-unlock to prevent 'svn commit' from automatically
On Wed, Feb 12, 2014 at 11:10 AM, C M wrote:
> Does anyone know what this error means and how I can correct it?
>
> svn: E22: /.subversion/config:93: Option expected
>
> I am getting this message whi
Does anyone know what this error means and how I can correct it?
svn: E22: /.subversion/config:93: Option expected
I am getting this message while trying to browse the SVN repos from a build
server. This was working fine a few days ago (when I last accessed the repo
from this server).
My SVN
Ben,
I should have checked "svn help" before posting...thank you for the
response.
On Thu, Dec 5, 2013 at 11:32 AM, Ben Reser wrote:
> On 12/5/13 9:29 AM, C M wrote:
> > Hello.
> >
> > I ran "svn merge --reintegrate --dry-run" against branch. As part
Hello.
I ran "svn merge --reintegrate --dry-run" against branch. As part of the
dry-run preview, several files are marked with:
Rpath-to-file\src\Update.c
What does the "R" mean? I haven't encountered it before. Can someone please
explain?
Thank you.
Unfortunately, we are lacking on processes and there's a definite lack of
product management.
But coming back to my original question: Are there any potential gotchas
with using a single/shared branch? For now, that's the only change the team
(and leadership) is looking to as the "solution".
Our
What are some of the pros/cons of using a single/shared branch versus the
private developer branch?
We are having an internal debate within the team where the idea of a
single/shared branch was proposed in reaction to two specific issues:
1. In the merge to trunk from individual developer branche
Dear Sir
We got this error "Can't parse lock/entries hashfile /foldername/filename.
Serialized hash missing terminator" in one of our repositories when trying
to browse or update the repository.Running svnadmin lslock on the
repository folder on the server also produced the same error message
d..
On Mon, Jun 17, 2013 at 1:47 PM, Les Mikesell wrote:
> On Mon, Jun 17, 2013 at 12:59 PM, C M wrote:
> > We are on SVN 1.7.6.
> >
> > Trunk is empty because this is/was a new development effort. The code was
> > directly imported into the developer's branch.
incoming edit upon merge
Summary of conflicts:
Tree conflicts: 8
On Mon, Jun 17, 2013 at 12:40 PM, Andrew Reedick wrote:
>
>
> > From: C M [mailto:cmanalys...@gmail.com]
> > Sent: Monday, June 17, 2013 12:39 PM
> > To: C. Michael Pilato
> > Cc: Subversion
> > Su
on 1190)
+++ txt/pod_block.txt (revision 1245)
@@ -1,7 +1,7 @@
On Mon, Jun 17, 2013 at 11:56 AM, C. Michael Pilato wrote:
> On 06/17/2013 12:39 PM, C M wrote:
> > I think my earlier mistake might have been that I was using the
> > --reintegrate option.
> > Without it,
l\src\mtl
Amtl\src\makefile
Amtl\src\mtl.c
Amtl\inc
Amtl\inc\mtl_meter.h
C util_panel
U .
Summary of conflicts:
Tree conflicts: 8
On Mon, Jun 17, 2013 at 10:38 AM, C. Michael Pilato wrote:
> On 06/17/2013 11:19 AM, C M wrote:
> > Hello,
> >
> >
Hello,
Code for a new development effort was imported into a developer’s branch.
Now we want merge his changes to trunk (which is currently empty).
I tried the merge from both the command line and the Tortoise GUI and keep
running into the “…must be ancestrally related…” message.I also tried the
This is precisely what we are looking for. For the most part, we distribute
a new executable for each update, so an overwrite is all we care about.
The main reason we are moving to SVN is because the current deployment
process uses a fileshare where updates are pushed out to. At least with
SVN, we
ch all
the executables are stored.
On Fri, May 3, 2013 at 11:44 AM, Les Mikesell wrote:
> On Fri, May 3, 2013 at 11:23 AM, C M wrote:
> > We plan to use a SVN repository as a deployment mechanism so technicians
> can
> > download and install the application binaries for a
Hello,
We plan to use a SVN repository as a deployment mechanism so technicians
can download and install the application binaries for a customer system.
The directory where we want them to download from will always have the
"current" binaries.
The issue I am facing is how to replace (overwrite)
r177.
I re-ran it without the dry run, then ran diff after the update.
We are set. Thank you.
Amad
On Mon, Apr 29, 2013 at 1:41 PM, Les Mikesell wrote:
> On Mon, Apr 29, 2013 at 1:23 PM, C M wrote:
> > The working copy (head revision) is at 661. 177 is what I want to go back
>
The working copy (head revision) is at 661. 177 is what I want to go back
to.
Is this the syntax to use (from within the working copy:
svn merge -r661:177?
On Fri, Apr 26, 2013 at 8:53 PM, Les Mikesell wrote:
> On Fri, Apr 26, 2013 at 6:18 PM, C M wrote:
> > Deleting the trunk
to but nothing happens.
svn status shows nothing. What am I missing?
On Fri, Apr 26, 2013 at 12:33 AM, Lorenz wrote:
> C M wrote:
> >Some files were committed to trunk which have incorrect updates.
> >
> >What's the easiest way to roll back to the previous version
I am certain there is simple way out of this situation.
Some files were committed to trunk which have incorrect updates.
What's the easiest way to roll back to the previous versions (before the
erroneous changes were committed)?
Should I checkout the previous revision and commit them over the er
We've had mixed results using svn externals and have decided to remove them
altogether. Mostly, bi-directional changes we weren't expecting. This was
also because of our inexperience with SVN and using externals.
In any event, my questions are:
1. If I delete the externals from /trunk, what will
AM -0500, C M wrote:
> > Hello,
> >
> > When svn: external properties are updated on trunk, how can those updates
> > be propagated to developer branches that are coming off the trunk?
>
> By using the 'svn merge' command.
> See http://svnbook.red-bean.com/en/1.7/svn.branchmerge.html
>
Hello,
When svn: external properties are updated on trunk, how can those updates
be propagated to developer branches that are coming off the trunk?
Is there a svn command I can run to “push” those updates? I tried "svn
update" but that didn't do the job.
Please advise.
Amad.
I am not seeing anything in: /tags/Rel_1.0.
Mind you I am using the Tortoise SVN 1.7 client to do the copy.
On Wed, Feb 20, 2013 at 12:05 PM, Les Mikesell wrote:
> On Wed, Feb 20, 2013 at 11:58 AM, C M wrote:
> > The external definitions do specify a revision. That part is worki
ernals to a specific revision, or tag the externals first and rewrite
> your externals to point to the tagged externals.
>
>
>
>
> On Wed, Feb 20, 2013 at 10:28 AM, C M wrote:
>
>> It seems that SVN does not tag svn:externals.
>>
>> We have defined a s
It seems that SVN does not tag svn:externals.
We have defined a structure such that child projects have link from a
parent project.
Parent project -> child project_1
-> child project_2
-> child project_3
However, when you go to tag a release for a chil
But that means I have to create a working copy. I don't necessarily want to
do that if all I am looking for is a directory listing.
On Wed, Feb 20, 2013 at 11:06 AM, Geoff Hoffman
wrote:
>
>
> On Wed, Feb 20, 2013 at 10:02 AM, C M wrote:
>
>> The "svn list"
The "svn list" command does not list directory entries if they are
svn:externals.
Assuming this is by design, is there a way for it list externals also?
Dear All,
I need to add new files to my project. Is there a way to create an empty
working copy where I just copy the new files into it and then commit them?
It seems unnecessary to have to checkout the whole project (or parts of it)
to the working copy when I don't need to update anything existi
As a SVN newbie myself, I suggest you set up a SVN sandbox and try out the
basic functionality within it.
You will get a better understanding of how SVN works by trying out various
commands.
Regards.
Amad
On Thu, Feb 14, 2013 at 1:58 PM, Z W wrote:
> Hi All
>
> We are SVN newbies here.
> We pl
2013, at 12:24, Ryan Schmidt wrote:
> >
> > > On Feb 1, 2013, at 11:00, C M wrote:
> > >
> > >> I was able to set multiple external definitions using the --file
> option. Worked pretty well, actually considering how challenging everything
> else has been
y.
On Wed, Jan 30, 2013 at 4:38 PM, Ryan Schmidt <
subversion-20...@ryandesign.com> wrote:
>
> On Jan 30, 2013, at 14:14, C M wrote:
>
> > Thank you for the "teach a man to fish" approach. Though I didn't find
> the documentation to be very clear, I was abl
Hello,
My question is more process related with using svn:externals. In my
testing, it seems that the svn:externals links are bi-directional. Changes
are instantly propagated via the magic of svn:externals.
1. How do users preserve the integrity of a tag (which was created off a
branch which had
Ryan,
Thank you for the "teach a man to fish" approach. Though I didn't find the
documentation to be very clear, I was able to set the property using the
syntax below.
c:\Temp\800>svn propset svn:externals "ver_1.0
svn://3.x.x.x/trunk/Customer1/system_800/ver_1.0" .
property 'svn:externals' set
Hello,
I am attempting to set the svn:externals property via the command line, in
hopes of ultimately creating a batch file/script as we have a huge number
of externals to set. That dilemma aside, when I run the command, I get the
message show below.
My expectation is that this will set the prop
All,
I am setting up a new repository and have a question on how to handle
“common” code. Common refers to code which is shared across the multiple
systems that we deploy.
In addition to the common code, we also have system-specfic software
(custom code).
Given the typical SVN layout, what’
36 matches
Mail list logo
