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
That old branch was named "MyApp_resouces" (note spelling) and then renamed
Again, that branch was reintegrated into trunk and all seemed well.
Later, at revsion 2717, I created a new branch from trunk called
Now, I've got up-to-date trunk and branch with this svn:merginfo:
Branch:
$ svn info
$ svn propget svn:mergeinfo --depth=infinity
Seems like there's some old merginfo in there. (The log.conf
Trunk:
$ svn info
$ svn propget svn:mergeinfo --depth=infinity
What do I need to do to get --reintegrate to work? I'm confused
-- 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.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.