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

Merge/Commit Bug?

From: Andy Somerville <andy.somerville.work_at_gmail.com>
Date: 2006-01-07 01:28:10 CET

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

However, once I have resolved the confilcts and attempt to commit, I
get the following:

     svn: Source url
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:


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.

     Andy Somerville

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jan 7 05:22: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.