Hello,
I have seen an issue with subversion in which tree conflicts are being
produced when creating a branch from a working copy in which not all
files are at the same revision. This is happening when trying to merge
changes into this branch.
Please refer to the following sequence. Is this
If you look at the svn_fs.h API, they are both referred to
as revision roots. svn_fs_revision_root() and
svn_fs_txn_root() both return a svn_fs_root_t * object.
That does not sound like they're both being referred to as
revision roots; that sounds like they're both being
referred to as
Hi,
I know, this is maybe not the best practice, but, unfortunately, our
subversion users do this all the time: they merge form one branch to another
back and forward.
The question is, how to properly do it without introducing conflicts.
Here is the test case, which one would think should be
On Thu, Apr 29, 2010 at 10:08 AM, Vadym Chepkov vchep...@gmail.com wrote:
Hi,
I know, this is maybe not the best practice, but, unfortunately, our
subversion users do this all the time: they merge form one branch to another
back and forward.
The question is, how to properly do it without
Like yourself, I initially though that it would be able to deal with this,
but it doesn't seem to (and there is probably a very good reason why it
can't).
I would be interested in knowing this very good reason why it can't. I'm
not questioning its validity, I'm confident this good reason is
Hello,
I have a query. How to find tag(s) associated with any file available in trunk?
For example cvs stat shows the list of tags associated with any file. Can
something like this be done in SVN?
Best,
Hemant
Unstoppable..
On Thu, Apr 29, 2010 at 2:08 PM, Wadhavankar, Hemant
hemant.wadhavan...@lsi.com wrote:
Hello,
I have a query. How to find tag(s) associated with any file available in
trunk? For example “cvs stat” shows the list of tags associated with any
file. Can something like this be done in SVN?
I have a subversion server running with apache. It authenticates users
using LDAP configuration and uses SVN path-based authorizations to limit
user access to certain repositories. This works perfectly.
Now, I have a service I want to setup (rietveld, for code reviews) that
needs to have an
On Thu, Apr 29, 2010 at 3:09 PM, Didier Trosset
didier_tros...@agilent.comwrote:
I have a subversion server running with apache. It authenticates users
using LDAP configuration and uses SVN path-based authorizations to limit
user access to certain repositories. This works perfectly.
Now, I
On Thu, Apr 29, 2010 at 11:53 AM, vishwajeet singh dextrou...@gmail.com wrote:
On Thu, Apr 29, 2010 at 3:09 PM, Didier Trosset didier_tros...@agilent.com
wrote:
I have a subversion server running with apache. It authenticates users
using LDAP configuration and uses SVN path-based
On Thu, Apr 29, 2010 at 12:08 PM, Andy Levy andy.l...@gmail.com wrote:
On Thu, Apr 29, 2010 at 04:38, Wadhavankar, Hemant
hemant.wadhavan...@lsi.com wrote:
Hello,
I have a query. How to find tag(s) associated with any file available in
trunk? For example “cvs stat” shows the list of tags
On Apr 29, 2010, at 3:47 AM, Daniel Becroft wrote:
[b2]$ svn merge --dry-run ^/branches/b1
--- Merging r2 through r4 into '.':
C README
Summary of conflicts:
Tree conflicts: 1
After r3, you'll need to do a '--record-only' merge of r4 into the second
branch:
(untested) svn
On Thursday 29 Apr 2010, j_dorocak wrote:
Dear SVN folks,
I am trying to import the current status of my apache2 server directory
structure into a repository.
I get cut off after 2 successes:
Adding /home/jdor/webapps/pinax07server/apache2/logs
Adding
Take a look at the website [1], there you will find the binary
packages [2] and a link to one of the manuals [3].
[1] http://subversion.apache.org
[2] http://subversion.apache.org/packages.html
[3] http://svnbook.red-bean.com/
. . . .
I work at a company that is considering the use of
Dear All,
I am a complete new comer to Subversion and our project is about to take
it on.
As a version control system. I am initially inpressed by it and am now
trying
to get it to work via a browser. I want to include mod_dav_svn.so in the
httpd.conf file but mod_dav_svn.so does not exist in my
I have an issue with subversion dumps (RHEL 5.2; subversion 1.5.0; viewvc
1.0.7) when I'm trying to load onto a new server (CentOS 5.4; subversion
1.6.11; viewvc 1.0.11). On disk, the size of the folder for one of the
repositories is 1.3gb. When I do a dump, the file size is 1.3gb.
However,
On Thu, Apr 29, 2010 at 10:34 PM, Seth Simmons ssimm...@cymfony.com wrote:
I have an issue with subversion dumps (RHEL 5.2; subversion 1.5.0; viewvc
1.0.7) when I’m trying to load onto a new server (CentOS 5.4; subversion
1.6.11; viewvc 1.0.11). On disk, the size of the folder for one of the
[b2]$ svn merge --dry-run ^/branches/b1
--- Merging r2 through r4 into '.':
C README
Summary of conflicts:
Tree conflicts: 1
and yet another strange thing about it.
There is no way to automatically resolve a conflict like this.
no matter what flag I use --accept mine-conflict,
The second course in the series, Introduction to Subversion for
Developers will take place on Wednesday, May 5, 2010 at 9AM PDT.
Subversion's architecture and design principles will be covered and
attendees will be introduced to using Subversion for software
development.
Yes that seems to be the difference.
I had one of my developers check one repository that was much smaller on the
new server and the current revision matches.
From: vishwajeet singh [mailto:dextrou...@gmail.com]
Sent: Thursday, April 29, 2010 1:13 PM
To: Seth Simmons
Cc:
I'm working on some Subversion-related software for propagating trunk
checkins to any of dozens of target branches, based on trunk's checkin
comments (that is, where the checkins need to subsequently go automatically is
determined by the checkin comments in trunk, and those comments are
prepared
On Thu, Apr 29, 2010 at 11:23 AM, Les Mikesell lesmikes...@gmail.com wrote:
On 4/29/2010 1:06 PM, Dan Stromberg wrote:
I'm working on some Subversion-related software for propagating trunk
checkins to any of dozens of target branches, based on trunk's checkin
comments (that is, where the
I have two projects under a single repository, with A being dependent on
B being checked out.
To set the svn:externals propset, can I use a relative path for the
checkout directory for the depending (B) directory?
Such as :
svn propset svn:externals ../buildsupport
On 04/29/2010 01:09 PM, David Bartmess wrote:
I have two projects under a single repository, with A being dependent on
B being checked out.
To set the svn:externals propset, can I use a relative path for the
checkout directory for the depending (B) directory?
Such as :
svn propset
On Thu, Apr 29, 2010 at 9:17 PM, Vadym Chepkov vchep...@gmail.com wrote:
On Apr 29, 2010, at 3:47 AM, Daniel Becroft wrote:
[b2]$ svn merge --dry-run ^/branches/b1
--- Merging r2 through r4 into '.':
C README
Summary of conflicts:
Tree conflicts: 1
After r3, you'll need to do a
David Bartmess wrote:
I have two projects under a single repository, with A being dependent
on B being checked out.
To set the svn:externals propset, can I use a relative path for the
checkout directory for the depending (B) directory?
Such as :
svn propset svn:externals ../buildsupport
On 4/29/2010 2:18 PM, Blair Zajac wrote:
On 04/29/2010 01:09 PM, David Bartmess wrote:
I have two projects under a single repository, with A being dependent on
B being checked out.
To set the svn:externals propset, can I use a relative path for the
checkout directory for the depending (B)
On Thu, Apr 29, 2010 at 6:45 PM, Joël Conraud jconr...@gmail.com wrote:
Like yourself, I initially though that it would be able to deal with this,
but it doesn't seem to (and there is probably a very good reason why it
can't).
I would be interested in knowing this very good reason why it
28 matches
Mail list logo
