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

RE: Merge/Commit Bug?

From: Lieven Govaerts <lgo_at_mobsol.be>
Date: 2006-01-07 09:40:39 CET

Andy,

can you provide a transcript of what you're doing so this list can
look into it with more detail? Please also add the result of 'svn info'
on the working copies.
Before filing a bug, also provide your OS, SVN version of client and
server etc.

Lieven.

> -----Original Message-----
> From: Andy Somerville [mailto:andy.somerville.work@gmail.com]
> Sent: zaterdag 7 januari 2006 1:28
> To: users@subversion.tigris.org
> Subject: Merge/Commit Bug?
>
> Hi all,
>
> I have a merge question. I did a merge of the changes from
> the first to last revisions of a branch onto a branched copy
> of the trunk:
>
> svn merge -r84:132
> svn+ssh://user.name@host/svn/repo/branches/branch_1.0.0.0/
>
> However, once I have resolved the confilcts and attempt to
> commit, I get the following:
>
> svn: Source url
> svn+ssh://user.name@host/svn/repo/branches/branch_1.0.0.0/blabla.sln'
> is from different repository
>
> If I go into particular directories and try to commit (the
> src subdir for example), it shows the same message with a
> different argument.
>
>
> The only thing weird about my merge that I can thing of as
> being an edge case is that I am not merging back onto the
> trunk directly but rather copying the current trunk to a new
> branch and using that as my working copy.
>
> I searched on google for clues, but did not find anything
> relevant. I presented my issue in #irc on irc.freenode.net,
> and it was suggested that I have run into a bug. The relevant
> log is here:
>
> http://colabti.de/irclogger/irclogger_log/svn?date=2006-01-07
>
> My handel is catskul and the discussion starts at exactly
> 00:00 (the top).
>
>
> I intend to file a bug report, but I wanted to check here first.
>
> Please reply to my address as well as the list if you reply
> as I am not subscribed.
>
>
>
> Regards,
> Andy Somerville
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
> --
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.1.371 / Virus Database: 267.14.14/222 - Release
> Date: 5/01/2006
>
>

-- 
No virus found in this outgoing message.
Checked by AVG Free Edition.
Version: 7.1.371 / Virus Database: 267.14.15/223 - Release Date: 6/01/2006
 
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jan 7 09:44:29 2006

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.