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

Re: merging help needed

From: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-01-26 12:44:43 CET

On Jan 26, 2006, at 06:45, Matthew Boehm wrote:

> I then copied (using svn copy) svn://localhost/schtml/prod to svn://
> localhost/schtml/preprod to create a seperate branch.

Did you really? If so, then I'm not seeing how the problem occurred
right now. The only thing that occurs to me is that you maybe had a
working copy of /, used "svn copy prod preprod" locally, then already
started making changes to preprod, and then committed this all at
once -- the copy and the modifications -- and this became revision 2.
If that's what you did, then it's best to do only one task in each
commit -- revision 2 should have been the copy, and any modifications
should have been revision 3. Otherwise the beginning of preprod does
not match the state of prod from which it was copied, resulting in
merges that skip that initial set of modifications.

> Now, we recently did a lot of changes to preprod and those commits
> incremented the revision of preprod to 8. Now we want to merge
> preprod@8 with prod@1
> So I went into /home/me/prod and did this:
> svn merge -r 1:8 svn://localhost/svhtml/preprod
> U somefile.c
> U another.c
> U andanother.h
> svn ci -m "merged preprod@8 into prod@9"
> svn update
> (at revision 9)

Looks generally fine... I would have written the commit message
"merged revisions 1-8 of preprod into prod." You can't know the
revision number you'll end up with, since the repository doesn't
assign that until it receives the transaction and verifies it, so
it's not feasible to put that into the commit message. And it's a
good idea to specify both the "from" and the "to" revisions.

> However, there were several files that did not get merged. Any
> ideas on why? I went back to /home/me/preprod and looked at file
> "thisone.c" and it clearly had many changes in it that were not
> merged. In fact, if you notice above, thisone.c isn't even
> mentioned in the file modification list.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 26 12:46:12 2006

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.