svn 1.5.1 merge clue required

Hi all,

I'd be greatly appreciative of any help/suggestions regarding what I'm
doing wrong here...

I have a vendor branch in https://xxx/vendor/freebsd/8.x which I created
a feature branch from in rev 95 i.e. "svn cp
https://xxx/vendor/freebsd/8.x https://xxx/feature/8.x" created rev 95.
Both svn client and server are 1.5.1 and the repository has been
"svnadmin upgraded" after being initially created with 1.5.0. I've been
keeping my feature branch in sync with the vendor branch as is evidenced
(I think!) by the output of the commands below run from a pristine
working copy of the https://xxx/feature directory.

root_at_lstewart3# svn propget svn:mergeinfo 8.x
/vendor/freebsd/8.x:95-389

root@lstewart3# svn mergeinfo https://xxx/vendor/freebsd/8.x 8.x
r108
r109
r110
r111
r112
r113
r114
r115
r121
r258
r259
r266
r268
r270
r271
r381
r383

root_at_lstewart3# svn mergeinfo --show-revs eligible
https://xxx/vendor/freebsd/8.x 8.x

root@lstewart3# svn info https://xxx/vendor/freebsd/8.x
...
Revision: 474
Last Changed Rev: 383
...

root@lstewart3# svn diff -r 390:head https://xxx/vendor/freebsd/8.x

- Reports nothing

My understanding of the output of the above commands is that running
"svn merge https://xxx/vendor/freebsd/8.x 8.x" should do nothing except
update the mergeinfo entry on the 8.x directory to something like
"/vendor/freebsd/8.x:95-474". However, I get the following:

root@lstewart3# svn merge https://xxx/vendor/freebsd/8.x 8.x
Conflict discovered in '8.x/lib/libarchive/archive_entry_strmode.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
         (h) help for more options:

etc. etc. for a whole heap of file changes being pulled in from the
vendor branch. Props get changed, files added/deleted. etc.

I don't understand why changes are being pulled in. I haven't yet
figured out which rev of https://xxx/vendor/freebsd/8.x it is trying to
remerge into my feature branch, but I don't think it's all that
important anyway as to my mind it shouldn't be trying to merge anything.

Thanks in advance for any insights that will steer me in the right
direction.

Cheers,
Lawrence

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-06 17:04:49 CEST