On Tue, Jun 18, 2013 at 10:57:28AM -0500, Les Mikesell wrote:
> Would it have made a difference in the subversion processing if the
> empty trunk had been copied to create the branch before the initial
> import? That is, would having a common ancestor as the parent
> directory have made the 'adds'
On Tue, Jun 18, 2013 at 9:47 AM, Stefan Sperling wrote:
> On Tue, Jun 18, 2013 at 09:33:25AM -0500, Les Mikesell wrote:
>> On Tue, Jun 18, 2013 at 4:31 AM, Stefan Sperling wrote:
>>
>> > In your case, the latter isn't true. You have a new directory /trunk,
>> > which is empty, and you are trying
On Tue, Jun 18, 2013 at 09:33:25AM -0500, Les Mikesell wrote:
> On Tue, Jun 18, 2013 at 4:31 AM, Stefan Sperling wrote:
>
> > In your case, the latter isn't true. You have a new directory /trunk,
> > which is empty, and you are trying to merge changes into it.
>
> Is there any advantage in mergi
On Tue, Jun 18, 2013 at 4:31 AM, Stefan Sperling wrote:
> In your case, the latter isn't true. You have a new directory /trunk,
> which is empty, and you are trying to merge changes into it.
Is there any advantage in merging changes to an empty path as compared
to just copying to it?
--
Les
On Mon, Jun 17, 2013 at 04:01:43PM -0500, C M wrote:
> Well, for what its worth, I was able to complete the "merge" following
> steps 3 -6 in this article.
>
> http://kirenpillay.blogspot.com/2012/07/svn-merge-tree-conflict-resolution.html
>
> I don't understand why SVN behaved the way it did and
Well, for what its worth, I was able to complete the "merge" following
steps 3 -6 in this article.
http://kirenpillay.blogspot.com/2012/07/svn-merge-tree-conflict-resolution.html
I don't understand why SVN behaved the way it did and prevented the branch
to trunk merge as expected..
On Mon, J
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.
>
> I ran these two commans in the working copy and get the messages you
> mentioned. What does that me
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
> From: C M [mailto:cmanalys...@gmail.com]
> Sent: Monday, June 17, 2013 12:39 PM
> To: C. Michael Pilato
> Cc: Subversion
> Subject: Re: Ancestrally Related Error Message
>
> I think my earlier mistake might have been that I was using the --reintegrate
> option.
&
Running without the dry-run option doesn't do anything different (it still
reports the conflicts). Yes, the diff shows the content I am expecting (at
least for the text files).
I ran "svn diff -r1190:1245 --summarize https://path_to_branch/SCR_BR/"; and
see output like:
M path_to_file
M path_to_f
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, I make some progress, but still not quite what I am expecting.
>
> Again, given that trunk is empty, why the "C" (tree conflicts)? I would
> expect all of then
13 12:39 PM
To: C. Michael Pilato
Cc: Subversion
Subject: Re: Ancestrally Related Error Message
I think my earlier mistake might have been that I was using the --reintegrate
option.
Without it, I make some progress, but still not quite what I am expecting.
Again, given that trunk is empty, why t
I think my earlier mistake might have been that I was using the
--reintegrate option.
Without it, I make some progress, but still not quite what I am expecting.
Again, given that trunk is empty, why the "C" (tree conflicts)? I would
expect all of then to be "A" (additions), no?
The DEV_WC current
On 06/17/2013 11:19 AM, C M wrote:
> 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 “…mus
> 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 als
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
16 matches
Mail list logo
