Re: Changeset One
From: mark <extrapic_at_extrapic.com>
Date: Wed, 09 Jul 2008 09:00:01 +0100
I am using
svn, version 1.4.6 (r28521)
compiled Mar 3 2008, 19:24:51
The intention was that one new, empty branch would have all changes imported
by merges, never commit. And there would never be anything else except merges.
It seemed to work fine for changeset 2 and beyond, I suppose because changeset 2
is in fact differences between r1 and r2 but changeset 1 is differences between r0 and r1
and r0 is not a real revision...
The error I got is
svn: Unable to find repository location for 'file:///home/markw/jjj-central/dev/v23' in revision 0
I will have another look at this in terms of addressing the comment about
lack of ancestral relationship.
Paul Burba wrote:
On Tue, Jul 8, 2008 at 8:28 AM, Mark Phippard <firstname.lastname@example.org> wrote:On Tue, Jul 8, 2008 at 11:06 AM, Mark Phippard <email@example.com> wrote:On Tue, Jul 8, 2008 at 3:48 AM, ExtraPic <firstname.lastname@example.org> wrote:I can reproduce with the following script. Its a simple script, needs to run in your home directory and will trash the following 3 locations in your home directory: jjj2 jjj jjj-central It ends with an error message. The script is attached. Note that I am not an experienced subversion user. Thanks for your offer to try it.I have not tried this yet, but one thing about that seems somewhat not valid is that your branches have no relationship to each other. Your branches should be created by copying something, otherwise there is no ancestral relationship between the paths. I am not saying your merge should not have still worked, just that as an example this is odd and not how one would use Subversion.When I run your script I do not get any merge output and that is to be expected. You are trying to merge r1 but the branch was created in r1 so merge tracking will not merge any changes from that revision. If you change your script so that the files are added and committed after the first import, and then merge -c 2 or even just leave off the -c argument altogether, it works fine.Hi Mark (Winder), I agree with everything Mark P. has said thus far. I cannot reproduce the error you are seeing with either 1.5.0 or the latest trunk (r32029) build. What Subversion build are you using? Paul
--------------------------------------------------------------------- To unsubscribe, e-mail: email@example.com For additional commands, e-mail: firstname.lastname@example.org Received on 2008-07-09 18:19:53 CEST
This is an archived mail posted to the Subversion Users mailing list.