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

Re: How does merge-tracking work

From: RoryBecker <RoryBecker_at_gmail.com>
Date: Tue, 7 Oct 2008 04:37:03 -0700 (PDT)

I think I've found the solution
It seems that I was using a workaround to a previous subversion bug/
issue.

I have been using a url syntax that involved someusername@

thus

http://SomeUsername@Myserver:8080/MyRepo/trunk/

instead of

http://Myserver:8080/MyRepo/trunk/

It seems that the repobrowser link I had was accessing the repo and
therefore creating working copies with the syntax that did not have
the SomeUsername@ in it.

However I was passing a url syntax to the merge command which did
contain this information.

The system must have been deducing that the urls had no common history
but still attempted the merge anyway and thus was attempting to
operate from revision 1 onward.

Thanks very much for all help in this matter. It does now appear to be
resolved.

I would still be interested to hear any opinion on what I have
discovered though.

On Oct 7, 11:12 am, RoryBecker <RoryBec..._at_gmail.com> wrote:
> No success I'm afraid.
>
> In fact the merge performed in the new repository seemed to have
> conflicts.
>
> In reality this should not have been possible since no changes have
> occurred which should have resulted in 0 conflicts.
> However as noted this operation seems to result in a merge of all
> revisions.
>
> On Oct 7, 10:27 am, RoryBecker <RoryBec..._at_gmail.com> wrote:
>
>
>
> > Ok I have done some research on dump and load and determined that if
> > nothing else I should be able to safely dump my live repo and load it
> > into a new repo in which I can experinment. I will write back with any
> > results
>
> > On Oct 7, 8:45 am, RoryBecker <RoryBec..._at_gmail.com> wrote:
>
> > > > > I think there was an import process of some kind but my memory is
> > > > > vague in that area.
>
> > > > Seehttp://subversion.tigris.org/svn_1.5_releasenotes.html#repos-upgrades
>
> > > > If svnadmin dump/load was not done, or you didn't run the commands in
> > > > the release notes there, then merge tracking may not work.
>
> > > ok I have done the "SVNAdmin Upgrade" which apparently worked
> > > successfully but took mere milliseconds.
>
> > > I deduce from this that it was already upgraded.
> > > In any case I copied a new branch and attempted to merge into it from
> > > the trunk again.
>
> > > I was met, as each time before, with what appeared to be an attempt to
> > > process everything since revision 1.
> > > Each and every file in the entire repository was processed ( added or
> > > skipped) and I feel that this is unlikely to be correct.
>
> > > What is a dump/load for and is it likely that my installation of
> > > VisualSVN did it during it's upgrade?
>
> > > I'm very wary of messing with my repo without learning what I'm doing
> > > first.
>
> > > I have backups but I'm not entirely sure how I would restore them
> > > other than overwriting what is already there.
>
> > > Sorry if that seems a little untrusting or paranoid. I do appreciate
> > > your help
>
> > > ---------------------------------------------------------------------
> > > To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> > > For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org
>
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> > For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-07 13:49:59 CEST

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