[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Ancestrally Related Error Message

From: C M <cmanalyst66_at_gmail.com>
Date: Mon, 17 Jun 2013 12:19:17 -0500

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_file
M path_to_file

Without the "--summarize" option, I see the file content which matches what
we are expecting. This is for the text files which SVN identified as being

I have several developer branches to merge to trunk. If I can't get the
merge to work, is doing a copy from the branch to trunk an option? Will
that create further issues downstream? I know no one has a crystal ball,
but I have limited experience with SVN and dont know what to expect.

See example below

--- txt/pod_block.txt (revision 1190)
+++ txt/pod_block.txt (revision 1245)
@@ -1,7 +1,7 @@

On Mon, Jun 17, 2013 at 11:56 AM, C. Michael Pilato <cmpilato_at_collab.net>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, 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 currently only shows the two dirs which SVN correctly
> recognized
> > as additions.
> >
> > c:\Temp\DEV_WC>svn merge --dry-run --ignore-ancestry
> > https://path_to_branch/SCR_BR/
> >
> > --- Merging r1191 through r1245 into '.':
> Do these revision numbers (r1191 and r1245) match what you'd expect? What
> happens if you do this:
> svn diff -r1190:1245 https://path_to_branch/SCR_BR/
> Do you see exactly the additions that you would expect to see?
> --
> C. Michael Pilato <cmpilato_at_collab.net>
> CollabNet <> www.collab.net <> Enterprise Cloud Development
Received on 2013-06-17 19:19:51 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.