I'm trying to merge changes from the trunk into the multi-auth branch.
svn merge --dry-run -r 2892:HEAD
http://code.djangoproject.org/svn/django/trunk
works fine, but when I try to do it for real:
svn merge -r 2892:HEAD http://code.djangoproject.org/svn/django/trunk
svn barfs with the following:
svn: Copyfrom-url
'http://code.djangoproject.org/svn/django/trunk/django/conf/locale/el/LC_MESSAGES/django.mo'
has different repository root than 'http://code.djangoproject.com/svn'
Anyone seen this before? A google search seems to suggest that it's a
problem adding new files, the merges seem to work fine. Do I need to
manually copy new files from the trunk before merging?
Joseph
P.S.
svn merge --ignore-ancestry --dry-run
http://code.djangoproject.org/svn/django/branches/[EMAIL PROTECTED]
http://code.djangoproject.org/svn/django/[EMAIL PROTECTED]
Seems to do the wrong thing entirely.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-developers
-~----------~----~----~----~------~----~------~--~---
