And yes I know it does matter what way you invoke the tool, I was trying to
figure out what was going on with the original problem by putting together
a quick scenario (OK a slightly wobbly one).
But I had to jump to conclusions to guess what was occurring
in the original question. How else can you
Oh and Stefan
"Again, please verify that you're invoking the tool in the right way
before jumping to conclusions."
Jumping to conclusions is the only way I get exercise :) :)
On 9 December 2011 16:52, Rob Pointer wrote:
> Stefan
> That's exactly what I was saying, that if any merging/copy has
Stefan
That's exactly what I was saying, that if any merging/copy has occurred
from trunk to branch, then you need to use the reintegrate merge. if you
don't then that's when you get merge conflicts.
On 9 December 2011 14:00, Stefan Sperling wrote:
> On Fri, Dec 09, 2011 at 01:05:02PM +, Ro
On Fri, Dec 9, 2011 at 5:24 AM, Stefan Sperling wrote:
> On Fri, Dec 09, 2011 at 07:10:41AM +, Cooke, Mark wrote:
> > I don't use the command line much but could you not plit it over three
> lines?
> > {{{
> > Fetching external item:
> > from : '...'
> > into : '...'
> > }}}
>
> I like this
> On 8 December 2011 18:10, Stefan Sperling wrote:
> On Thu, Dec 08, 2011 at 10:15:24AM -0700, Randall Reynolds wrote:
> > When I select merge a range of revisions and leave the range blank, it says:
> >
> > Merging r7 through 42194
> > <~10 tree conflicts on main folders>
> >
> > Does this mean w
On Fri, Dec 09, 2011 at 07:06:10AM -0700, Randall Reynolds wrote:
> Little tangent here, but FWIW I found that the version on the server
> supported merge tracking so it was super wierd that the whole codebase
> reported tree conflicts. I think we merged incorrectly a long time ago and
> this migh
Little tangent here, but FWIW I found that the version on the server
supported merge tracking so it was super wierd that the whole codebase
reported tree conflicts. I think we merged incorrectly a long time ago and
this might have caused the conflicts. I just rebranched, problem solved,
next step
On Fri, Dec 09, 2011 at 01:05:02PM +, Rob Pointer wrote:
> Mark
> If you put changes multiple times from trunk to a branch (in development
> terms, a re-base) you can cause reflective merges and actually cause more
> problems. The recommended merge back into trunk is a reintegrate merge.
> I a
Let me explain my reasoning.
My thinking is that if you are trying to merge from trunk to branch, then
you are doing things the wrong way around, because if you copy out from
trunk, you merge back into trunk.
The other issue may be that If you copy from trunk more than once to the
same branch (fr
Mark
If you put changes multiple times from trunk to a branch (in development
terms, a re-base) you can cause reflective merges and actually cause more
problems. The recommended merge back into trunk is a reintegrate merge.
I am not sure if this has been addressed in 1.7, but certainly for earlie
I have been looking through this thread and it might be resolved.
Can I ask why you are trying to merge from trunk into the branch? The
usual operation would be the other way around, otherwise you can run into
reflective merge issues.
Rob
On 8 December 2011 18:10, Stefan Sperling wrote:
> On
> -Original Message-
> From: Rob Pointer [mailto:rpoin...@clearvision-cm.com]
> Sent: 09 December 2011 12:45
> To: Randall Reynolds; Cooke, Mark; users@subversion.apache.org
> Subject: Re: Question
>
> I have been looking through this thread and it might be resolved.
>
> Can I ask wh
On Fri, Dec 09, 2011 at 07:10:41AM +, Cooke, Mark wrote:
> I don't use the command line much but could you not plit it over three lines?
> {{{
> Fetching external item:
> from : '...'
> into : '...'
> }}}
I like this idea.
Daniel Shahaf wrote on Fri, Dec 09, 2011 at 09:06:38 +0200:
> How would you avoid overflowing the terminal width when the external's
> URL is absolute?
>
To answer my own question: only print the absolute URL of an external
when the property specifies a relative external.
> Dmitry Bolshakov wrot
imho the log completeness is more important then pretty view
all the more so as most modern displays are widescreen
why the width is an issue?
Original Message
Subject: Re: small feature request: when checkout/update print out svn:external
addresses
From: Daniel Shahaf
To: Dm
Marc Schlinger wrote on Fri, Dec 09, 2011 at 10:02:16 +0100:
> Le jeudi 08 décembre 2011 à 19:39 +0200, Daniel Shahaf a écrit :
> > Marc Schlinger wrote on Thu, Dec 08, 2011 at 16:00:03 +0100:
> > > Le jeudi 08 décembre 2011 à 15:20 +0200, Daniel Shahaf a écrit :
> > > > Marc Schlinger wrote on Thu
Le jeudi 08 décembre 2011 à 19:39 +0200, Daniel Shahaf a écrit :
> Marc Schlinger wrote on Thu, Dec 08, 2011 at 16:00:03 +0100:
> > Le jeudi 08 décembre 2011 à 15:20 +0200, Daniel Shahaf a écrit :
> > > Marc Schlinger wrote on Thu, Dec 08, 2011 at 14:07:06 +0100:
> > > > Hello,
> > > >
> > > > I'm
17 matches
Mail list logo
