On Tue, Apr 19, 2011 at 09:34:17PM -0400, Daniel Walter wrote:
> I understand what is going on now, but this seems to indicate that I
> will need to look up revision numbers from tags every time I do a
> merge in SVN. Is there any automated way of doing this? It seems
> like a huge step backwards
On Wed, Apr 20, 2011 at 03:43:06PM +1000, Gavin "Beau" Baumanis wrote:
> Hi Everyone,
>
> I am having some issues understanding tree conflicts.
>
> I attempted the following;
> svn merge -r1:head trunk/com/palcare/listsServices/
> branches/production/com/palcare/listsServices/ --accept="theirs-f
Hi,
I didn't get information related to setup two svnservers with svnsync by
providing checkin and checkout on two servers.
More clearly I have two servers at different location. I have to make sync
and provide access to users to check in and check out from any of the
server. Not as mirror.
--
Hi Stefan,
That is awesome thinks
I have had a quick scan, but it is getting let here and I have been up since
very early.
So I'll wait until tomorrow until trying to digest it all, properly.
I'll post back with what I have tried and what did / didn't work.
I really appreciate the assistanc
On Apr 20, 2011, at 06:23, phaneedra wrote:
> I didn't get information related to setup two svnservers with svnsync by
> providing checkin and checkout on two servers.
>
> More clearly I have two servers at different location. I have to make sync
> and provide access to users to check in and che
Guten Tag phaneedra,
am Mittwoch, 20. April 2011 um 13:23 schrieben Sie:
> More clearly I have two servers at different location. I have to make sync
> and provide access to users to check in and check out from any of the
> server. Not as mirror.
This is not possible at the moment. You may want t
On Wed, Apr 20, 2011 at 1:16 PM, Ryan Schmidt <
subversion-20...@ryandesign.com> wrote:
For full multiple-master capability, you'll have to look elsewhere. For
> example, WANdisco is a commercial product that's based on Subversion that
> offers this.
>
> http://www.wandisco.com/subversion/multisi
Hi,
We are using svn 1.6.16 on the server and have noticed that there is a large
pause in the inital https requests, (snip of wireshark shown bellow). Basically
it looks like this is a server side issue but i am not sure where to look for
logs (apache ?).
10.141.80.130 (server)
10.141.81.134 (
--
From: "Stefan Sperling"
Sent: Wednesday, April 20, 2011 6:38 AM
To: "Daniel Walter"
Cc: "Bob Archer" ;
Subject: Re: duplicate merge conflict
On Tue, Apr 19, 2011 at 09:34:17PM -0400, Daniel Walter wrote:
I understand what is going on now, bu
> > On Tue, Apr 19, 2011 at 09:34:17PM -0400, Daniel Walter wrote:
> >> I understand what is going on now, but this seems to indicate
> that I
> >> will need to look up revision numbers from tags every time I do
> a
> >> merge in SVN. Is there any automated way of doing this? It
> seems
> >> like
If you are merging everything in there is no need to worry. That is the
point of merge tracking. It will determine what has yet to be merged and
select the correct revisions.
Here is how we have our repo set up... rather than using trunk. We find it
makes things easier.
We basically "branch"
On Wed, Apr 20, 2011 at 10:05:08AM -0400, Daniel Walter wrote:
> >4.1.x-release +LR--
> > / | +--- 4.3.x-release
> > / | /
> >/ |
> > If you are merging everything in there is no need to worry. That
> is the
> > point of merge tracking. It will determine what has yet to be
> merged and
> > select the correct revisions.
> >
> > Here is how we have our repo set up... rather than using trunk.
> We find it
> > makes things easier
On Wed, 20 Apr 2011 14:06 +0100, "Matthew Fletcher"
wrote:
> Hi,
>
> We are using svn 1.6.16 on the server and have noticed that there is a large
> pause in the inital https requests, (snip of wireshark shown bellow).
> Basically it looks like this is a server side issue but i am not sure wh
The '--ignore-space-change' option, and '--ignore-all-space' for
that matter, to the 'diff' and 'blame' commands doesn't seem to
ignore changes in the EOL style. I really expect each of:
--ignore-eol-style
--ignore-space-change
--ignore-all-space
in the given order to include the effect of th
AIUI, --ignore-eol-style + --ignore-space-change == --ignore-all-space. It
seems to me that --ignore-all-space would work for your use case?
On Wed, 20 Apr 2011 20:44 +0300, "Stanimir Stamenkov"
wrote:
> The '--ignore-space-change' option, and '--ignore-all-space' for
> that matter, to the 'd
No, I don't think that's correct.
--ignore-space-change: ignores changes in the amount of white-space,
but not ignoring "all white-space". This means that "having no
white-space" in not considered equal to "having white-space". Example:
"abc def" is considered equal to "abc def", but not equ
Like I said, we don't even have a path named "trunk".
The paths to the above versions in the repo would be like:
svn://server/repo/project/v1.0.0
svn://server/repo/project/v1.0.1 (this was copied from the 1.0.0 path)
svn://server/repo/project/v1.0.2 (this was copied from the 1.0.1 path)
On my
> > Like I said, we don't even have a path named "trunk".
> >
> > The paths to the above versions in the repo would be like:
> >
> > svn://server/repo/project/v1.0.0
> > svn://server/repo/project/v1.0.1 (this was copied from the 1.0.0
> path)
> > svn://server/repo/project/v1.0.2 (this was copied
Hello all,
I just got bitten by what looks like a bug in the handling of tree conflicts
involving replaced files. To demonstrate:
User A replaces foo.txt and commits their change:
$ svn st -v
R44 abuchananfoo.txt
$ svn commit -m 'replacing foo'
Replacing foo.txt
U
Wed, 20 Apr 2011 21:38:55 +0200, /Johan Corveleyn/:
On Wed, Apr 20, 2011 at 8:03 PM, Daniel Shahaf wrote:
AIUI, --ignore-eol-style + --ignore-space-change ==
--ignore-all-space. It seems to me that --ignore-all-space would
work for your use case?
No, I don't think that's correct.
--ignore
On Wed, 20 Apr 2011 21:38 +0200, "Johan Corveleyn" wrote:
> No, I don't think that's correct.
>
> --ignore-space-change: ignores changes in the amount of white-space,
> but not ignoring "all white-space". This means that "having no
> white-space" in not considered equal to "having white-space".
Thu, 21 Apr 2011 07:07:31 +0300, /Daniel Shahaf/:
On Wed, 20 Apr 2011 21:38 +0200, "Johan Corveleyn" wrote:
No, I don't think that's correct.
--ignore-space-change: ignores changes in the amount of white-space,
but not ignoring "all white-space". This means that "having no
white-space" in not
I can reproduce this with current trunk.
Output immediately after the 'update' which introduces a conflict:
[[[
% svnqlite3-dump ../ | grep iota
INSERT INTO "ACTUAL_NODE"
VALUES(1,'trunk/iota','trunk',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'(conflict
iota file update deleted edited (version file:///
On Thu, 21 Apr 2011 07:16 +0300, "Stanimir Stamenkov"
wrote:
> Thu, 21 Apr 2011 07:07:31 +0300, /Daniel Shahaf/:
> > On Wed, 20 Apr 2011 21:38 +0200, "Johan Corveleyn" wrote:
> >> Can't you just use both options?
> >> svn diff / blame -x --ignore-space-change -x --ignore-eol-style
> >>
> >
Ian Wild wrote on Wed, Apr 20, 2011 at 13:28:53 +0100:
> using our own patented active-active replication technology.
What is the patent number?
26 matches
Mail list logo
