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

RE: Rectifying a foobar split/merger

From: Cooke, Mark <mark.cooke_at_siemens.com>
Date: Mon, 14 Jun 2010 09:35:25 +0100

> -----Original Message-----
> From: scarleton_at_gmail.com [mailto:scarleton_at_gmail.com] On
> Behalf Of Sam Carleton
> Sent: 14 June 2010 01:19
> To: users_at_subversion.apache.org
> Subject: Rectifying a foobar split/merger
> I have foobared the branch and cannot merge it anymore. The
> main trunk is the next release; the branch (v0.9.4) is the
> current code in which I am fixing bugs and releasing point
> releases, like v0.9.4.1, v0.9.4.2, etc. I believe where I
> made mistake here:
> When I release code, I tag the v0.9.4 branch to the specific
> version. Then when I did a few of the merges, I merged the
> tag, not the v0.9.4 branch.
> Now the new things I have had to add, say in tag v0.9.4.3 I
> added a file, now it always comes up with a conflict. I am
> assuming that is because now that I am at tag v0.9.4.7,
> subversion isn't able to figure out the connection between
> the two tags. On the other hand, it is my theory that if I
> had simply always merged in the branch, there wouldn't be an issue.
> Things have gotten worse now that I have added a new folder.
> Is there some way to reconcile this?
I think you need to look at the --record-only option:


~ mark c
Received on 2010-06-14 10:36:19 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.