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

Need help with a merge

From: Bill Moseley <moseley_at_hank.org>
Date: Tue, 16 Dec 2008 18:50:46 -0800

Last month I had a problem with a reintegrate due to moving a number
of files. I managed to --reintegrate after deleting svn:merginfo
manually from all except the '.' dir.

That old branch was named "MyApp_resouces" (note spelling) and then renamed
to fix spelling.

Again, that branch was reintegrated into trunk and all seemed well.

Later, at revsion 2717, I created a new branch from trunk called
/branches/release-2008-12-11. I've been merging changes from trunk
into the branch over the last few days and all seemed well. Not it's
time to reintegrate into trunk again.

Now, I've got up-to-date trunk and branch with this svn:merginfo:

Branch:

    $ svn info
    Path: .
    URL: http://svn:4001/svn/branches/release-2008-12-11
    Repository Root: http://svn:4001/svn
    Repository UUID: 25354952-de2d-0410-a591-b0e5b52bdfb9
    Revision: 2734
    Node Kind: directory
    Schedule: normal
    Last Changed Author: bill
    Last Changed Rev: 2734
    Last Changed Date: 2008-12-16 17:40:38 -0800 (Tue, 16 Dec 2008)

    $ svn propget svn:mergeinfo --depth=infinity
    . - /branches/MyApp_resouces:2601
    /branches/MyApp_resources:2602-2643
    /trunk/MyApp:2717-2733
    conf/log.conf - /branches/MyApp_resouces/conf/log.conf.tmpl:2601
    /branches/MyApp_resources/conf/log.conf.tmpl:2602-2643

Seems like there's some old merginfo in there. (The log.conf
file did get renamed in this current branch.)

Trunk:

    $ svn info
    Path: .
    URL: http://svn:4001/svn/trunk/MyApp
    Repository Root: http://svn:4001/svn
    Repository UUID: 25354952-de2d-0410-a591-b0e5b52bdfb9
    Revision: 2734
    Node Kind: directory
    Schedule: normal
    Last Changed Author: fred
    Last Changed Rev: 2728
    Last Changed Date: 2008-12-15 18:32:44 -0800 (Mon, 15 Dec 2008)

    $ svn propget svn:mergeinfo --depth=infinity
    . - /branches/MyApp_resouces:2601
    /branches/MyApp_resources:2602-2643
    conf/log.conf.tmpl - /branches/MyApp_resouces/conf/log.conf.tmpl:2601
    /branches/MyApp_resources/conf/log4.conf.tmpl:2602-2643

What do I need to do to get --reintegrate to work? I'm confused
because of the seemingly left over MyAPP_resources and MyApp_resources
branches.

-- 
Bill Moseley
moseley_at_hank.org
Sent from my iMutt
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=985419
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-18 14:02:49 CET

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