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

Re: need help merging the dont-save-plaintext-... branch into trunk

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Tue, 06 May 2008 08:27:14 -0700

Stefan Sperling wrote:
> Hello,
>
> can someone help me with merging the dont-save-plaintext-... branch
> back into trunk?
>
> This happens when I try to reintegrate the branch:
>
> $ svn merge --reintegrate https://svn.collab.net/repos/svn/branches/dont-save-plaintext-passwords-by-default
> subversion/libsvn_client/merge.c:5487: (apr_err=195016)
> svn: Cannot reintegrate from 'https://svn.collab.net/repos/svn/branches/dont-save-plaintext-passwords-by-default' yet:
> Some revisions have been merged under it that have not been merged
> into the reintegration target; merge them first, then retry.
> $ svn pg svn:mergeinfo
> /branches/1.5.x-r30215:30238
> /branches/diff-callbacks3:29985-30687
> /branches/log-g-performance:30867-30958
> /branches/svn-mergeinfo-enhancements:30045-30214
> /branches/svnserve-logging:29754-30819
>
> The mergeinfo on the branch is as follows:
>
> $ svn pg svn:mergeinfo
> /branches/1.5.x-r30215:30238
> /branches/diff-callbacks3:29985-30687
> /branches/log-g-performance:30867-30958
> /branches/svn-mergeinfo-enhancements:30045-30214
> /branches/svnserve-logging:29754-30819
> /trunk:30654-31042
>
> I don't see why it's giving me the error.
> The mergeinfo is matching up just fine as far as I can tell.
> I've synced up the branch to latest trunk, and there was no
> commit between me doing the syncing and trying to merge.
>
> What am I doing wrong?

You aren't doing anything wrong. --reintegrate just isn't smart enough to
deal with this.

The workaround is easy (and frankly, should be suggested by the reintegrate
error, I think). If you are sure that your branch contains all the trunk
changes, just do this:

$ cd /path/to/trunk
$ svn merge https://svn.collab.net/repos/svn/trunk \
https://svn.collab.net/repos/svn/branches/dont-save-plaintext-passwords-by-default

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

Received on 2008-05-06 17:27:30 CEST

This is an archived mail posted to the Subversion Dev mailing list.