Re: [Fwd: svn 1.5.1 merge clue required]

Lawrence Stewart wrote:
> Hi all,
>
> I haven't had any nibbles from the users@ mailing list so I'm hoping
> someone here might have some thoughts...

Note for the future: dev@ is *not* part of some grand escalation policy of
users@.

> 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.

If you do a --dry-run merge, does that help you determine what revisions are
incoming?

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand